2 files changed, 32 insertions, 5 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 7737ae4c..0da1b87e 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,7 +61,7 @@ exports.Main = Montage.create(Component, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
-                                                componentInstance._montage_metadata.label = componentInstance.identifier = data.name;
+                                                componentInstance.identifier = data.identifier;
                         componentInstance.addEventListener("firstDraw", self, false);
 
                         componentInstance.element = element;
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index a57c9efc..ab033433 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -267,9 +267,12 @@ exports.ComponentsPanel = Montage.create(Component, {
             }
             that = this;
             element = this.makeComponent(component.component);
-
-            this.application.ninja.currentDocument.model.views.design.iframe.contentWindow.addComponent(element,
-                {name: component.name, path: component.module, firstDraw: {cb: this.componentInstanceOnFirstDraw, ctx: this}},
+            this.application.ninja.currentDocument.model.views.design.iframe.contentWindow.addComponent(element, {
+                    identifier: this.CreateUniqueComponentName(component.name),
+                    name: component.name,
+                    path: component.module,
+                    firstDraw: {cb: this.componentInstanceOnFirstDraw, ctx: this}
+                },
                 function(instance, element) {
 
                     //var pos = that.getStageCenter();
@@ -289,7 +292,8 @@ exports.ComponentsPanel = Montage.create(Component, {
 
                     //that.application.ninja.elementMediator.addElements(element, styles);
                     ElementController.addElement(element, styles);
-                });
+                }
+            );
 
         }
     },
@@ -388,5 +392,28 @@ exports.ComponentsPanel = Montage.create(Component, {
 
             //return this.centerStage;
         }
+    },
+
+    CreateUniqueComponentName: {
+        value: function(name) {
+            for(var i=1; i < 1000; i++) {
+                if(!this.ComponentNameExists(name + i)) {
+                    return name + i;
+                }
+            }
+        }
+    },
+
+    ComponentNameExists: {
+        value: function(name) {
+            var filteredList = this.application.ninja.currentDocument.model.mObjects.filter(function(obj){
+                if(name === obj.identifier) return true;
+            });
+            if (filteredList.length > 0) {
+                return true;
+            } else {
+                return false;
+            }
+        }
     }
 });
\ No newline at end of file