diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
index 46a4238c0c..7faaddde77 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
@@ -100,6 +100,10 @@
         }
 
         function submit() {
+            if (!formHelper.submitForm({ scope: $scope })) {
+                return;
+            }
+
             vm.saveButtonState = "busy";
 
             var preValues = dataTypeHelper.createPreValueProps(vm.dataType.preValues);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
index 3faf74fdef..8acaa544c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
@@ -1,7 +1,8 @@
 <div ng-controller="Umbraco.Editors.DataTypeSettingsController as vm">
-<umb-editor-view data-element="editor-data-type-settings">
 
-    <form novalidate name="dataTypeSettingsForm" val-form-manager>
+<form novalidate name="dataTypeSettingsForm" val-form-manager>
+
+    <umb-editor-view data-element="editor-data-type-settings">
 
         <umb-editor-header
             name="model.title"
@@ -66,7 +67,8 @@
             </umb-editor-footer-content-right>
         </umb-editor-footer>
 
-    </form>
+    </umb-editor-view>
+
+</form>
 
-</umb-editor-view>
 </div>