diff --git a/web/pgadmin/static/js/sqleditor/query_tool_actions.js b/web/pgadmin/static/js/sqleditor/query_tool_actions.js
index 2f0655b0..1618ed26 100644
--- a/web/pgadmin/static/js/sqleditor/query_tool_actions.js
+++ b/web/pgadmin/static/js/sqleditor/query_tool_actions.js
@@ -22,7 +22,7 @@ let queryToolActions = {
   },
 
   executeQuery: function (sqlEditorController) {
-    if(sqlEditorController.is_query_tool) {
+    if (sqlEditorController.is_query_tool) {
       this._clearMessageTab();
       sqlEditorController.execute();
     } else {
@@ -114,50 +114,30 @@ let queryToolActions = {
     );
   },
 
-  focusOut: function() {
+  focusOut: function () {
     document.activeElement.blur();
     window.top.document.activeElement.blur();
   },
 
-  getKeyboardShortcuts: function(sqlEditorController) {
-    let execute_query_pref = window.top.pgAdmin.Browser.get_preference(
-      'sqleditor', 'execute_query'),
-      explain_query_pref = window.top.pgAdmin.Browser.get_preference(
-        'sqleditor', 'explain_query'
-      ),
-      explain_analyze_query_pref = window.top.pgAdmin.Browser.get_preference(
-        'sqleditor', 'explain_analyze_query'
-      ),
-      download_csv_pref = window.top.pgAdmin.Browser.get_preference(
-        'sqleditor', 'download_csv'
-      ),
-      next_panel_perf = window.top.pgAdmin.Browser.get_preference(
-        'sqleditor', 'move_next'
-      ),
-      previous_panel_perf = window.top.pgAdmin.Browser.get_preference(
-        'sqleditor', 'move_previous'
-      );
-
-    if(!execute_query_pref && sqlEditorController.handler.is_new_browser_tab) {
-      execute_query_pref = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'execute_query'
-      ),
-      explain_query_pref = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'explain_query'
-      ),
-      explain_analyze_query_pref = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'explain_analyze_query'
-      ),
-      download_csv_pref = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'download_csv'
-      ),
-      next_panel_perf = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'move_next'
-      ),
-      previous_panel_perf = window.opener.pgAdmin.Browser.get_preference(
-        'sqleditor', 'move_previous'
-      );
-    }
+  getKeyboardShortcuts: function (browser, sqlEditorController) {
+    const execute_query_pref = browser.get_preference(
+      'sqleditor', 'execute_query'
+    );
+    const explain_query_pref = browser.get_preference(
+      'sqleditor', 'explain_query'
+    );
+    const explain_analyze_query_pref = browser.get_preference(
+      'sqleditor', 'explain_analyze_query'
+    );
+    const download_csv_pref = browser.get_preference(
+      'sqleditor', 'download_csv'
+    );
+    const next_panel_perf = browser.get_preference(
+      'sqleditor', 'move_next'
+    );
+    const previous_panel_perf = browser.get_preference(
+      'sqleditor', 'move_previous'
+    );
 
     sqlEditorController.handler.keyboardShortcuts = {
       'execute': execute_query_pref.value,
@@ -167,7 +147,6 @@ let queryToolActions = {
       'move_next': next_panel_perf.value,
       'move_previous': previous_panel_perf.value,
     };
-
   },
 };
 
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index d1313038..544d2436 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -20,19 +20,19 @@ define('tools.querytool', [
   'sources/keyboard_shortcuts',
   'sources/sqleditor/query_tool_actions',
   'pgadmin.datagrid',
+  'pgadmin.browser',
   'sources/../bundle/slickgrid',
   'pgadmin.file_manager',
   'backgrid.sizeable.columns',
   'slick.pgadmin.formatters',
   'slick.pgadmin.editors',
-  'pgadmin.browser',
   'pgadmin.tools.user_management',
 ], function(
   babelPollyfill, gettext, url_for, $, _, S, alertify, pgAdmin, Backbone, codemirror,
   pgExplain, GridSelector, ActiveCellCapture, clipboard, copyData, RangeSelectionHelper, handleQueryOutputKeyboardEvent,
   XCellSelectionModel, setStagedRows, SqlEditorUtils, ExecuteQuery, transaction,
   HistoryBundle, queryHistory, React, ReactDOM,
-  keyboardShortcuts, queryToolActions, Datagrid) {
+  keyboardShortcuts, queryToolActions, Datagrid, Browser) {
   /* Return back, this has been called more than once */
   if (pgAdmin.SqlEditor)
     return pgAdmin.SqlEditor;
@@ -115,7 +115,7 @@ define('tools.querytool', [
       self.checkConnectionStatus();
 
       // Fetch and assign the shortcuts to current instance
-      queryToolActions.getKeyboardShortcuts(self);
+      queryToolActions.getKeyboardShortcuts(Browser, self);
 
       self.filter_obj = CodeMirror.fromTextArea(filter.get(0), {
         tabindex: '0',