diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index ffb692ced0..51938bd676 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -1,9 +1,9 @@
 <div ng-controller="Umbraco.PropertyEditors.textAreaController">
-	<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="10" class="umb-editor umb-textarea textstring" val-server="value" ng-keyup="model.change()"></textarea>
+	<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="{{model.config.rows || 10}}" class="umb-editor umb-textarea textstring" val-server="value" ng-keyup="model.change()"></textarea>
 	<span class="help-inline" val-msg-for="textarea" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
 	<span class="help-inline" val-msg-for="textarea" val-toggle-msg="valServer"></span>
     <div class="help" ng-if="model.maxlength">
         <strong>{{model.count}}</strong> 
         <localize key="textbox_characters_left">characters left</localize>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
index 659b1b3224..f4273303b4 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
@@ -20,6 +20,9 @@ namespace Umbraco.Web.PropertyEditors
         {
             [PreValueField("maxChars", "Maximum allowed characters", "number", Description = "If empty - no character limit")]
             public bool MaxChars { get; set; }
+
+            [PreValueField("rows", "Number of rows", "number", Description = "If empty - 10 rows would be set as the default value")]
+            public bool Rows { get; set; }
         }
     }
 }