diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index 7388d927a5..3d8f81a6ef 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -114,7 +114,7 @@ def xblock_handler(request, tag=None, package_id=None, branch=None, version_guid
                 return render_to_response('component.html', {
                     'preview': get_preview_html(request, component),
                     'editor': content,
-                    'display_name': component.display_name,
+                    'label': component.display_name or component.category,
                 })
         elif request.method == 'DELETE':
             delete_children = str_to_bool(request.REQUEST.get('recurse', 'False'))
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 5764fd3108..954aaf5c33 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -28,7 +28,7 @@
 </div>
 <div class="wrapper wrapper-component-action-header">
     <div class="component-header">
-    ${display_name}
+    ${label}
     </div>
     <ul class="component-actions">
       <li class="action-item action-edit">