diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 507ee1aa29..12fd392477 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -54,21 +54,16 @@
                 <h5>Add New Component</h5>
                 <ul class="new-component-type">
                   % for type, templates in sorted(component_templates.items()):
-		      % if len(templates) == 1:
-                          <li>
+		           <li>
+		      % if type == 'advanced' or len(templates) > 1:
+			    <a href="#" class="multiple_templates" data-type="${type}">
+		      % else:
                             <a href="#" class="single_template" data-type="${type}" data-location="${templates[0][1]}">
+		      % endif
                               <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>