diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 36548304f..615dc54bb 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1374,6 +1374,10 @@ textarea,
     padding: 5px 8px 4px;
     height: 31px;
     line-height: 20px;
+    
+    &.form-control--multiline {
+      min-height: 31px;
+    }
   }
 
   &.form-control--inline {
@@ -1383,6 +1387,7 @@ textarea,
 
   &.form-control--multiline {
     height: auto;
+    min-height: 41px;
   }
 
   &:focus,