diff --git a/themes/bootstrap/scss/_codemirror.scss b/themes/bootstrap/scss/_codemirror.scss
index aca7b8b6f0..b5a25f3352 100644
--- a/themes/bootstrap/scss/_codemirror.scss
+++ b/themes/bootstrap/scss/_codemirror.scss
@@ -7,12 +7,14 @@ $textarea-rows: 15;
   border: $card-border-width solid $card-border-color;
 
   @include border-radius($card-border-radius);
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/metro/scss/_codemirror.scss b/themes/metro/scss/_codemirror.scss
index bf2968629d..b2f6af9c1b 100644
--- a/themes/metro/scss/_codemirror.scss
+++ b/themes/metro/scss/_codemirror.scss
@@ -8,12 +8,14 @@ $textarea-rows: 15 !default;
   height: 20rem;
   border: 1px solid #ccc;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/pmahomme/scss/_codemirror.scss b/themes/pmahomme/scss/_codemirror.scss
index 20da936870..0caa7da603 100644
--- a/themes/pmahomme/scss/_codemirror.scss
+++ b/themes/pmahomme/scss/_codemirror.scss
@@ -4,12 +4,14 @@ $textarea-rows: 15;
 .CodeMirror {
   height: 20rem;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }