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