diff --git a/docs/en_US/release_notes_4_21.rst b/docs/en_US/release_notes_4_21.rst
index 1913b9bc3..a1a76639c 100644
--- a/docs/en_US/release_notes_4_21.rst
+++ b/docs/en_US/release_notes_4_21.rst
@@ -24,6 +24,7 @@ Bug fixes
 *********
 
 | `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ -  Ensure that the start and end date should be deleted when clear the selection for pgAgent Job.
+| `Issue #3972 <https://redmine.postgresql.org/issues/3972>`_ -  Modified keyboard shortcuts in Query Tool for OSX native support.
 | `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ -  Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out.
 | `Issue #4206 <https://redmine.postgresql.org/issues/4206>`_ -  Ensure that the grant wizard should be closed on pressing the ESC key.
 | `Issue #4512 <https://redmine.postgresql.org/issues/4512>`_ -  Fixed calendar opening issue on the exception tab inside the schedules tab of pgAgent.
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index ed54c3ccb..a2bcd78c6 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -2117,9 +2117,8 @@ define('pgadmin.browser', [
       'Ctrl-D': 'deleteLine',
       'Cmd-D': 'deleteLine',
 
-      // Go to start/end of Line
-      'Alt-Left': 'goLineStart',
-      'Alt-Right': 'goLineEnd',
+      'Alt-Up': 'goLineUp',
+      'Alt-Down': 'goLineDown',
 
       // Move word by word left/right
       'Ctrl-Alt-Left': 'goGroupLeft',