diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 7921da9c22..3db1221f5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -673,6 +673,7 @@ angular.module("umbraco")
                 return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
             };
 
+
             $scope.clearPrompt = function (scopedObject, e) {
                 scopedObject.deletePrompt = false;
                 e.preventDefault();
@@ -692,8 +693,15 @@ angular.module("umbraco")
             };
 
             $scope.getTemplateName = function (control) {
-                if (control.editor.nameExp) return control.editor.nameExp(control)
-                return control.editor.name;
+                var templateName = control.editor.name;
+                if (control.editor.nameExp) {
+                    var valueOfTemplate = control.editor.nameExp(control);
+                    if (valueOfTemplate != "") {
+                        templateName += ": ";
+                        templateName += valueOfTemplate;
+                    }
+                }
+                return templateName;
             }
 
             // *********************************************
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
index 49b843689b..210d167f9e 100644
--- a/src/Umbraco.Web.UI/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -7,14 +7,14 @@
     },
     {
         "name": "Image",
-        "nameTemplate": "{{ 'Image: ' + (value.udi | ncNodeName) }}",
+        "nameTemplate": "{{ value && value.udi ? (value.udi | ncNodeName) : '' }}",
         "alias": "media",
         "view": "media",
         "icon": "icon-picture"
     },
     {
         "name": "Macro",
-        "nameTemplate": "{{ 'Macro: ' + value.macroAlias }}",
+        "nameTemplate": "{{ value && value.macroAlias ? value.macroAlias : '' }}",
         "alias": "macro",
         "view": "macro",
         "icon": "icon-settings-alt"
@@ -27,7 +27,7 @@
     },
     {
         "name": "Headline",
-        "nameTemplate": "{{ 'Headline: ' + value }}",
+        "nameTemplate": "{{ value }}",
         "alias": "headline",
         "view": "textstring",
         "icon": "icon-coin",
@@ -38,6 +38,7 @@
     },
     {
         "name": "Quote",
+        "nameTemplate": "{{ value ? value.substring(0,32) + (value.length > 32 ? '...' : '') : '' }}",
         "alias": "quote",
         "view": "textstring",
         "icon": "icon-quote",