4 files changed, 15 insertions, 4 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 50171260..ef13f22e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 currentLayersSelectedLength = this.currentLayersSelected.length,
                                 arrLayersLength = this.arrLayers.length,
                                 returnVal = arrLayersLength -1;
+                        if (returnVal === -1) {
+                                return false;
+                        }
                         if (this.currentLayersSelected === false) {
                                 return false;
                         }
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index ab033433..073a4438 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, {
 
     componentInstanceOnFirstDraw: {
         value: function(instance) {
+            var addDelegate = this.application.ninja.elementMediator.addDelegate;
+            this.application.ninja.elementMediator.addDelegate = null;
             this.application.ninja.elementMediator.addElements(instance.element);
             this.application.ninja.currentDocument.model.mObjects.push(instance);
+            this.application.ninja.elementMediator.addDelegate = addDelegate;
         }
     },
 
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index 5361e5cc..d86c8d55 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -96,7 +96,10 @@ exports.CssStyleRule = Montage.create(Component, {
     handleStop : {
         value: function(e) {
             if(this.focusDelegate) {
-                e._event.detail.preventDefault();
+                if(e._event.detail.preventDefault) {
+                    e._event.detail.preventDefault();
+                }
+
                 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this);
             }
         }
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index 509ca565..f53937e6 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, {
         value: function(selection) {
             var list = this._getListForSelection(selection);
 
-            if(!list) {
+            if(list) {
+                this.displayedList = list;
+                this.update();
+            } else {
                 list = this.add(selection);
+                this.displayedList = list;
             }
-
-            this.displayedList = list;
         }
     },