diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js b/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
index dda607d..73af294 100644
--- a/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/templates/datagrid/js/datagrid.js
@@ -1,6 +1,7 @@
 define(
-  ['jquery','alertify', 'pgadmin', 'pgadmin.browser', 'wcdocker'],
-  function($, alertify, pgAdmin) {
+  ['jquery','alertify', 'pgadmin','codemirror', 'codemirror/mode/sql',
+   'pgadmin.browser', 'wcdocker'],
+  function($, alertify, pgAdmin, CodeMirror) {
     // Some scripts do export their object in the window only.
     // Generally the one, which do no have AMD support.
     var wcDocker = window.wcDocker,
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 6d2d626..45612f6 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -232,6 +232,7 @@
   font-size: 10px;
   line-height: 1.428571429;
   border-radius: 10px;
+  cursor: auto;
 }
 
 .visibility-hidden {