diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 880861b98a..7cd739af2b 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1780,6 +1780,7 @@ fieldset .disabled-field td {
 
 .CodeMirror-scroll {
   height:             <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+  overflow: auto;
 }
 
 .CodeMirror-gutter {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 23de23d0f6..577b864c55 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2123,6 +2123,7 @@ fieldset .disabled-field td {
 }
 
 .CodeMirror-scroll {
+  overflow: auto;
   height:             <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
 }