diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee
index 28186aac83..a072fcba4b 100644
--- a/cms/static/coffee/src/views/unit.coffee
+++ b/cms/static/coffee/src/views/unit.coffee
@@ -1,6 +1,7 @@
 class CMS.Views.UnitEdit extends Backbone.View
   events:
-    'click .new-component .new-component-type a': 'showComponentTemplates'
+    'click .new-component .new-component-type a.multiple_templates': 'showComponentTemplates'
+    'click .new-component .new-component-type a.single_template': 'saveNewComponent'
     'click .new-component .cancel-button': 'closeNewComponent'
     'click .new-component-templates .new-component-template a': 'saveNewComponent'
     'click .new-component-templates .cancel-button': 'closeNewComponent'
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index f6540fa1e5..c8faaf1a1f 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -53,13 +53,22 @@
               <div class="new-component">
                 <h5>Add New Component</h5>
                 <ul class="new-component-type">
-                  % for type in sorted(component_templates.keys()):
-                  <li>
-                    <a href="#" data-type="${type}">
-                      <span class="large-template-icon large-${type}-icon"></span>
-                      <span class="name">${type}</span>
-                    </a>
-                  </li>
+                  % for type, templates in sorted(component_templates.items()):
+		      % if len(templates) == 1:
+                          <li>
+                            <a href="#" class="single_template" data-type="${type}" data-location="${templates[0][1]}">
+                              <span class="large-template-icon large-${type}-icon"></span>
+                              <span class="name">${type}</span>
+                            </a>
+                          </li>
+		      % else:
+			   <li>
+			     <a href="#" class="multiple_templates" data-type="${type}">
+			       <span class="large-template-icon large-${type}-icon"></span>
+			       <span class="name">${type}</span>
+			     </a>
+			   </li>
+		      % endif
                   % endfor
                 </ul>
               </div>