diff --git a/src/style_manager/model/PropertyStack.js b/src/style_manager/model/PropertyStack.js
index ebda0a675..c9800e44c 100644
--- a/src/style_manager/model/PropertyStack.js
+++ b/src/style_manager/model/PropertyStack.js
@@ -309,6 +309,8 @@ export default class PropertyStack extends PropertyComposite {
     } else {
       this.getLayers().reset(layersNew);
     }
+
+    this.__upSelected({ noEvent: true });
   }
 
   __parseValue(value) {
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js
index 0c2b8cba5..b940be328 100644
--- a/src/style_manager/view/PropertyView.js
+++ b/src/style_manager/view/PropertyView.js
@@ -717,6 +717,6 @@ export default Backbone.View.extend({
 
     const onRender = this.onRender && this.onRender.bind(this);
     onRender && onRender();
-    this.setValue(model.getDefaultValue());
+    this.setValue(model.getValue());
   },
 });