diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs
index 57099272a5..a65e6f1afc 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs
@@ -30,8 +30,6 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "defaultTemplate")]
         public EntityBasic DefaultTemplate { get; set; }
 
-
-
         [DataMember(Name = "allowedContentTypes")]
         public IEnumerable<int> AllowedContentTypes { get; set; }
 
@@ -39,6 +37,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "isContainer")]
         public bool IsContainer { get; set; }
 
+        [DataMember(Name = "listViewEditorName")]
+        public string ListViewEditorName { get; set; }
+
         //we might not need this... 
         [DataMember(Name = "allowAsRoot")]
         public bool AllowAsRoot { get; set; }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
index ac88f6b111..cd5dd0bec3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
@@ -60,6 +60,7 @@ namespace Umbraco.Web.Models.Mapping
                     {
                         //use underlying logic to add the property group which should wire most things up for us
                         dest.AddPropertyGroup(groupDisplay.Name);
+                        
                         //now update that group with the values from the display object
                         Mapper.Map(groupDisplay, dest.PropertyGroups[groupDisplay.Name]);
                         
@@ -128,10 +129,17 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(
                     dto => dto.CompositeContentTypes,
                     expression => expression.MapFrom(dto => dto.ContentTypeComposition))
-                    
+
                 .ForMember(
                     dto => dto.Groups,
-                    expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver)));
+                    expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver)))
+                .AfterMap(((type, display) =>
+                {
+                    //TODO : How do we avoid hardcoding content here? 
+                    display.ListViewEditorName = Constants.Conventions.DataTypes.ListViewPrefix + type.Alias;
+                    if (string.IsNullOrEmpty(type.Alias))
+                        display.ListViewEditorName += "Content";
+                }));
 
             config.CreateMap<PropertyGroupDisplay, PropertyGroup>()
                 .ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))