2 files changed, 5 insertions, 4 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 1f8870ca..dd75e255 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -288,7 +288,6 @@ exports.PiData = Montage.create( Montage, {
                             type : "color",
                             prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
@@ -462,7 +461,6 @@ exports.PiData = Montage.create( Montage, {
                             type : "color",
                             prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 20dc308f..0088447a 100644
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -197,8 +197,11 @@ exports.Content = Montage.create(Component, {
 
                         if(control.type !== "color") {
                             currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
-                            currentValue ? currentValue = currentValue : currentValue = control.defaultValue;
-                            this.customSections[0].content.controls[control.id] = currentValue;
+                            if(currentValue === null)
+                            {
+                                currentValue = control.defaultValue;
+                            }
+                            this.customSections[i].content.controls[control.id] = currentValue;
                         }
                         else
                         {