diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index d4e09c0..2536fe3 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -1359,3 +1359,8 @@ table.backgrid {
 .aciTree.aciTreeLoad {
   background: none;
 }
+
+/* class to disable Codemirror editor */
+.cm_disabled {
+  background: #EEEEEE;
+}
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index b5905da..93c7921 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -35,7 +35,7 @@

 .editor-title {
   background-color: #2C76B4;
-  padding: 2px;
+  padding: 4px 5px;
   color: white;
   font-size: 13px;
 }
diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
index 5b08623..b4c48e8 100644
--- a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
@@ -1124,7 +1124,12 @@ define(
             }
           }
           else {
-            self.gridView.query_tool_obj.setOption("readOnly",true);
+            // Disable codemirror by setting cursor to nocursor and background to dark.
+            self.gridView.query_tool_obj.setOption("readOnly", 'nocursor');
+            var cm = self.gridView.query_tool_obj.getWrapperElement();
+            if (cm) {
+              cm.className += ' cm_disabled';
+            }
             self.disable_tool_buttons(true);
             self._execute_data_query();
           }