diff --git a/docs/en_US/keyboard_shortcuts.rst b/docs/en_US/keyboard_shortcuts.rst
index f2748e036..2194d63bc 100644
--- a/docs/en_US/keyboard_shortcuts.rst
+++ b/docs/en_US/keyboard_shortcuts.rst
@@ -55,6 +55,10 @@ When using the syntax-highlighting SQL editors, the following shortcuts are avai
 +--------------------------+------------------+-------------------------------------+
 | Ctrl+Minus               | Cmd+Minus        | Zoom out                            |
 +--------------------------+------------------+-------------------------------------+
+| Tab                      | Tab              | Indent selected text                |
++--------------------------+------------------+-------------------------------------+
+| Shift+Tab                | Shift+Tab        | Un-indent selected text             |
++--------------------------+------------------+-------------------------------------+
 
 **Query Tool**
 
diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js
index 8a3a3b921..9ca3a16d0 100644
--- a/web/pgadmin/browser/templates/browser/js/browser.js
+++ b/web/pgadmin/browser/templates/browser/js/browser.js
@@ -1833,7 +1833,10 @@ define(
       "Ctrl-Alt-Left": "goGroupLeft",
       "Cmd-Alt-Left": "goGroupLeft",
       "Ctrl-Alt-Right": "goGroupRight",
-      "Cmd-Alt-Right": "goGroupRight"
+      "Cmd-Alt-Right": "goGroupRight",
+
+      // Allow user to delete Tab(s)
+      "Shift-Tab": "indentLess"
     },
     editor_options: {
       tabSize: '{{ editor_tab_size }}',