diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index d828993e34..19d74024c7 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -271,7 +271,8 @@ def edit_unit(request, location):
             component_templates[template.location.category].append((
                 template.display_name,
                 template.location.url(),
-                'markdown' in template.metadata
+                'markdown' in template.metadata,
+                template.location.name == 'Empty'
             ))
 
     components = [
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 40dfd65381..f261be62fa 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -152,13 +152,16 @@
                 % for type, templates in sorted(component_templates.items()):
                 <div class="new-component-templates new-component-${type}">
                     <ul class="new-component-template">
-                        % for name, location, has_markdown in templates:
+                        % for name, location, has_markdown, is_empty in templates:
                         <li>
                             <a href="#" data-location="${location}">
                                 <span class="name">${name} 
                                 % if has_markdown:
                                      MD
                                 % endif
+                                % if is_empty:
+                                    <i>rasa</i>
+                                % endif
                                 </span>
                             </a>
                         </li>