diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 066c897471..0f2ae52962 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -409,7 +409,7 @@ input.umb-group-builder__group-sort-value {
     transform: translate(0, -50%);
   }
 
-  input.editor-label {
+  textarea.editor-label {
     border: none;
     box-shadow: none;
     width: 100%;
@@ -418,6 +418,8 @@ input.umb-group-builder__group-sort-value {
     margin-bottom: 10px;
     font-size: 16px;
     font-weight: bold;
+    resize: none;
+    line-height: 1.5em;
     &:focus {
       outline: none;
       box-shadow: none !important;
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 77d2c39744..8b494a057a 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
@@ -3,13 +3,14 @@
    <div class="umb-control-group clearfix">
 
       <div class="validation-wrapper">
-         <input class="editor-label"
+         <textarea class="editor-label"
             name="propertyLabel"
             ng-model="model.property.label"
             placeholder="Enter a name..."
             umb-auto-focus
             focus-on-filled="true"
-            required/>
+            umb-auto-resize
+            required/></textarea>
          <span class="validation-label" val-msg-for="propertyLabel" val-toggle-msg="required"><localize key="required" /></span>
       </div>