diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
index c708ea4f31..73975e64f2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
@@ -3,6 +3,39 @@
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="uc1" TagName="ContentTypeControlNew" Src="../controls/ContentTypeControlNew.ascx" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        jQuery(document).ready(function () {
+
+            // Auto selection/de-selection of default template based on allow templates
+            jQuery("#<%= templateList.ClientID %> input[type='checkbox']").on("change", function () {
+                var checkbox = jQuery(this);
+                var ddl = jQuery("#<%= ddlTemplates.ClientID %>");
+                // If default template is not set, and an allowed template is selected, auto-select the default template
+                if (checkbox.is(":checked")) {
+                    if (ddl.val() == "0") {
+                        ddl.val(checkbox.val());
+                    }
+                } else {
+                    // If allowed template has been de-selected, and it's selected as the default, then de-select the default template
+                    if (ddl.val() == checkbox.val()) {
+                        ddl.val("0");
+                    }
+                }
+            });
+
+            // Auto selection allowed template based on default template
+            jQuery("#<%= ddlTemplates.ClientID %>").on("change", function () {
+                var ddl = jQuery(this);
+                if (ddl.val() != "0") {
+                    jQuery("#<%= templateList.ClientID %> input[type='checkbox'][value='" + ddl.val() + "']").prop("checked", true);
+                }
+            });
+        });
+    </script>
+</asp:Content>
+
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
     <cc1:Pane ID="tmpPane" runat="server">