diff --git a/docs/en_US/release_notes_6_3.rst b/docs/en_US/release_notes_6_3.rst
index 9e8907747..9d233d2ff 100644
--- a/docs/en_US/release_notes_6_3.rst
+++ b/docs/en_US/release_notes_6_3.rst
@@ -35,3 +35,4 @@ Bug fixes
 | `Issue #7031 <https://redmine.postgresql.org/issues/7031>`_ -  Fixed an issue where SQLite database definition is wrong because the USER_ID FK references the table user_old which is not available.
 | `Issue #7040 <https://redmine.postgresql.org/issues/7040>`_ -  Add "section" to the Debian package control files.
 | `Issue #7044 <https://redmine.postgresql.org/issues/7044>`_ -  Update the dropzone version to 5.9.3 and Flask-SQLAlchemy to 2.5.*.
+| `Issue #7046 <https://redmine.postgresql.org/issues/7046>`_ -  Fixed some accessibility issues.
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
index 053410de0..ff149b27f 100644
--- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js
+++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
@@ -296,6 +296,23 @@ define([
           break;
         }
       }
+
+      let el_name = ev.target.name;
+      if(el_name == 'key'){
+        let $parentDiv = $el.closest('.value'),
+          $nextField = $parentDiv.find('.shift .btn-checkbox');
+
+        if ($nextField.length == 0) {
+          $nextField = $el.closest('.value').next().find('input.form-control');
+        }
+
+        if ($nextField.length) {
+          $nextField.focus();
+          ev.preventDefault();
+          ev.stopImmediatePropagation();
+          ev.stopPropagation();
+        }
+      }
     }
   });
   return alertify;
diff --git a/web/pgadmin/static/scss/_jsoneditor.overrides.scss b/web/pgadmin/static/scss/_jsoneditor.overrides.scss
index 4c27e5b3a..097aa6b9e 100644
--- a/web/pgadmin/static/scss/_jsoneditor.overrides.scss
+++ b/web/pgadmin/static/scss/_jsoneditor.overrides.scss
@@ -385,10 +385,6 @@ div.jsoneditor-value[contenteditable=true]:hover
     padding: 4px;
 }
 
-a:focus, input[type=checkbox]:focus, select:focus{
-   outline:none !important;
-}
-
 .jsoneditor-modal option{
   background-color: $color-primary-light !important;
   border: 1px solid $color-primary-light !important;