diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 1dbe51928c..599526d9f8 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1779,10 +1779,7 @@ fieldset .disabled-field td {
 }
 
 .CodeMirror-scroll {
-  height: auto;
-  overflow-y: auto;
-  overflow-x: auto;
-  max-height: 30em;
+  height:             <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
 }
 
 .CodeMirror-gutter {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 4a60f0f37d..d75b764566 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2123,10 +2123,7 @@ fieldset .disabled-field td {
 }
 
 .CodeMirror-scroll {
-  height: auto;
-  overflow-y: auto;
-  overflow-x: auto;
-  max-height: 30em;
+  height:             <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
 }
 
 .CodeMirror-gutter {