diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index 5e14be9ed9..21230a343d 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -25,7 +25,7 @@
     
   <cc2:Pane ID="Pane1" runat="server" Width="216" Height="80">
     <asp:DataGrid ID="dgTabs" Width="100%" runat="server" CellPadding="2" HeaderStyle-CssClass="propertyHeader"
-      ItemStyle-CssClass="propertyContent" GridLines="None" OnItemCommand="dgTabs_ItemCommand" OnPreRender="dgTabs_PreRender"
+      ItemStyle-CssClass="propertyContent" GridLines="None" OnItemCommand="dgTabs_ItemCommand" OnItemDataBound="dgTabs_ItemDataBound" OnPreRender="dgTabs_PreRender"
       HeaderStyle-Font-Bold="True" AutoGenerateColumns="False" CssClass="tabs-table">
       <Columns>
         <asp:BoundColumn DataField="id" Visible="False"></asp:BoundColumn>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
index 39f04b0688..fef17e6e2e 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -43,6 +43,17 @@ namespace Umbraco.Web.UI.Umbraco.Controls
                     table.Rows[table.Rows.Count - 1].TableSection = TableRowSection.TableFooter;
             }
         }
-      
+
+        protected void dgTabs_ItemDataBound(object sender, DataGridItemEventArgs e)
+        {
+            Table table = dgTabs.Controls[0] as Table;
+            if (table != null && table.Rows.Count > 0)
+            {
+                if (dgTabs.ShowHeader)
+                    table.Rows[0].TableSection = TableRowSection.TableHeader;
+                if (dgTabs.ShowFooter)
+                    table.Rows[table.Rows.Count - 1].TableSection = TableRowSection.TableFooter;
+            }
+        }
     }
 }
\ No newline at end of file