3 files changed, 8 insertions, 3 deletions

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 934a3851..cc99ca6c 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -243,8 +243,8 @@ exports.Properties = Montage.create(Component, {
                     controls = this.customSections[n].content.controls;
                     if(controls["colorSelect"]) {
                         controls["colorSelect"].destroy();
-                    } else if(controls["background"]) {
-                        controls["background"].destroy();
+                    } else if(controls["background-color"]) {
+                        controls["background-color"].destroy();
                     }
                 }
 
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ae408f11..9df16112 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
             this.controls[aField.id] = obj;
 
             // TODO - Hack for now to reference the color select object to unregister color chips
-            this.controls["background"] = obj;
+            this.controls["background-color"] = obj;
 
             return obj;
         }
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..2278623f 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -105,6 +105,8 @@ exports.ResizeComposer = Montage.create(Composer, {
     captureMouseup: {
         value: function(e) {
             e.preventDefault();
+            e.stopImmediatePropagation();
+            e.stopPropagation();
             window.removeEventListener("mousemove", this, true);
             window.removeEventListener("mouseup", this, true);
             this._executeEvent("resizeEnd");
@@ -113,6 +115,9 @@ exports.ResizeComposer = Montage.create(Composer, {
 
     captureMousemove: {
         value: function(e) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            e.stopPropagation();
             if (this.xAxis) {
                 this._deltaX = e.clientX - this._startX;
             }