diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
index 8b494a057a..18ecfedd1d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
@@ -10,7 +10,9 @@
             umb-auto-focus
             focus-on-filled="true"
             umb-auto-resize
-            required/></textarea>
+            required
+            overlay-submit-on-enter>
+         </textarea>
          <span class="validation-label" val-msg-for="propertyLabel" val-toggle-msg="required"><localize key="required" /></span>
       </div>
 
@@ -19,7 +21,13 @@
    </div>
 
    <div class="umb-control-group clearfix">
-      <textarea class="editor-description" ng-model="model.property.description" placeholder="Add your description here..." umb-auto-resize></textarea>
+      <textarea
+      class="editor-description"
+      ng-model="model.property.description"
+      placeholder="Add your description here..."
+      overlay-submit-on-enter
+      umb-auto-resize>
+      </textarea>
    </div>
 
    <div class="editor-wrapper umb-control-group clearfix" ng-model="model.property.editor" val-require-component>
@@ -65,7 +73,8 @@
          ng-change="vm.changeValidationPattern()"
          ng-if="vm.showValidationPattern"
          umb-auto-resize
-         focus-when="{{vm.focusOnPatternField}}">
+         focus-when="{{vm.focusOnPatternField}}"
+         overlay-submit-on-enter>
       </textarea>
 
    </div>