diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index 410f5ec60..5af03ba5c 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -52,9 +52,9 @@ iframe {
 }
 
 /* Ensure the codemirror editor displays full height gutters when resized */
-.CodeMirror-gutters {
-    height: 100% !important; 
-} 
+.CodeMirror, .CodeMirror-gutters {
+    height: 100% !important;
+}
 
 /* Padding for the treeview */
 .browser-browser-pane {
@@ -996,6 +996,10 @@ ul.nav.nav-tabs {
   background-position: 0px 2px;
 }
 
+.pgadmin-controls.SQL>.CodeMirror {
+  height: 500px !important;
+}
+
 /* This rule will stop Chrome apply highlighting to elements such as DIV's used as modals */ 
 *:focus {
   outline: none;