diff --git a/public/css/main.less b/public/css/main.less
index a4492ed832..22340bab55 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -530,6 +530,7 @@ form.code span {
   font-family: "Ubuntu Mono";
   padding-bottom: 0px;
   margin-bottom: 0px;
+  height: auto;
 }
 
 #mainEditorPanel .panel-body {
diff --git a/public/js/lib/codemirror/lib/codemirror.css b/public/js/lib/codemirror/lib/codemirror.css
index cb705fa0a2..4e479843c8 100644
--- a/public/js/lib/codemirror/lib/codemirror.css
+++ b/public/js/lib/codemirror/lib/codemirror.css
@@ -147,6 +147,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 .CodeMirror-scroll {
+    /* Commenting out for no scroll display
   overflow: scroll !important; /* Things will break if this is overridden */
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
diff --git a/public/js/lib/codemirror/theme/monokai.css b/public/js/lib/codemirror/theme/monokai.css
index 74c3d2d903..2aa742c4ca 100644
--- a/public/js/lib/codemirror/theme/monokai.css
+++ b/public/js/lib/codemirror/theme/monokai.css
@@ -1,6 +1,6 @@
 /* Based on Sublime Text's Monokai theme */
 
-.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2; border-radius: 5px;}
+.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2; border-radius: 5px; height: auto;}
 .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
 .cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
 .cm-s-monokai .CodeMirror-guttermarker { color: white; }