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 9865b38120..1d4a6e201f 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
@@ -796,6 +796,7 @@ input.umb-group-builder__group-sort-value {
         transform: translate(0, -50%);
     }
 
+    input.editor-label,  
     textarea.editor-label {
         border-color: transparent;
         box-shadow: none;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index 246cec9c50..76fbf8a3ba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -15,7 +15,7 @@
         var vm = this;
 
         const dataTypesCanBeChangedConfig = window.Umbraco.Sys.ServerVariables.umbracoSettings.dataTypesCanBeChanged;
-        
+
         vm.allowChangeDataType = false;
         vm.changeDataTypeHelpTextIsVisible = false;
         vm.propertyTypeHasValues = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 22f7cec252..6edb11f819 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -20,7 +20,8 @@
 
                         <div class="umb-control-group -no-border" ng-if="!model.property.locked">
                             <div class="control-group -no-margin">
-                                <textarea class="editor-label"
+                                <input type="text"
+                                          class="editor-label"
                                           data-element="property-name"
                                           name="propertyLabel"
                                           ng-model="model.property.label"
@@ -28,10 +29,8 @@
                                           placeholder="@placeholders_entername"
                                           umb-auto-focus
                                           focus-on-filled="true"
-                                          umb-auto-resize
                                           required
-                                          ng-keypress="vm.submitOnEnter($event)">
-                                </textarea>
+                                          ng-keypress="vm.submitOnEnter($event)" />
                                 <div ng-messages="propertySettingsForm.propertyLabel.$error" show-validation-on-submit>
                                     <span class="umb-validation-label" ng-message="required">Required label</span>
                                 </div>
@@ -47,11 +46,10 @@
                                     ng-model="model.property.description"
                                     localize="placeholder"
                                     placeholder="@placeholders_enterDescription"
-                                    ng-keypress="vm.submitOnEnter($event)"
                                     umb-auto-resize>
                         </textarea>
                         </div>
-                        
+
                         <ng-form name="dataTypeForm">
                             <div class="umb-control-group control-group" ng-model="model.property.editor" name="selectedEditor" val-require-component ng-if="!model.property.locked">
                                 <umb-button
@@ -82,7 +80,7 @@
                                         allow-change="vm.allowChangeDataType"
                                         on-change="vm.openDataTypePicker(model.property)">
                                     </umb-node-preview>
-                                    
+
                                     <div ng-if="vm.changeDataTypeHelpTextIsVisible" class="mt2 umb-alert umb-alert--info">
                                         <localize key="contentTypeEditor_changeDataTypeHelpText">
                                     </div>