diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js
index 1adae247..eda199a6 100644
--- a/umap/static/umap/js/umap.layer.js
+++ b/umap/static/umap/js/umap.layer.js
@@ -190,7 +190,8 @@ L.U.Layer.Choropleth = L.FeatureGroup.extend({
       [
         'options.choropleth.property',
         {
-          handler: 'BlurInput',
+          handler: 'Select',
+          selectOptions: this.datalayer._propertiesIndex,
           placeholder: L._('Choropleth property value'),
           helpText: L._('Choropleth property value'),
         },