2 files changed, 4 insertions, 1 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 579264cb..c5ccbc82 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
         ]
 }
\ No newline at end of file
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;
         }
     },