diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index 1370b7888..cbcecb853 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -9,6 +9,7 @@ for it.
 
 .. toctree::
 
+   release_notes_3_3
    release_notes_3_2
    release_notes_3_1
    release_notes_3_0
diff --git a/docs/en_US/release_notes_3_3.rst b/docs/en_US/release_notes_3_3.rst
new file mode 100644
index 000000000..cbc0ac235
--- /dev/null
+++ b/docs/en_US/release_notes_3_3.rst
@@ -0,0 +1,17 @@
+***********
+Version 3.3
+***********
+
+Release date: 2018-09-06
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.2
+
+
+Features
+********
+
+
+Bug fixes
+*********
+
+| `Bug #3407 <https://redmine.postgresql.org/issues/3407>`_ - Fix keyboard shortcuts layout in the preferences panel.
diff --git a/web/pgadmin/preferences/static/css/preferences.css b/web/pgadmin/preferences/static/css/preferences.css
index df748bc6b..269479987 100644
--- a/web/pgadmin/preferences/static/css/preferences.css
+++ b/web/pgadmin/preferences/static/css/preferences.css
@@ -48,3 +48,9 @@ div.pgadmin-preference-body div.ajs-content {
 .preferences_content .pgadmin-controls input[type="checkbox"] {
   margin-left: -20px !important;
 }
+
+.preferences_content .pgadmin-controls .shift,
+.preferences_content .pgadmin-controls .control,
+.preferences_content .pgadmin-controls .alt {
+  margin-left: 15px !important;
+}
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index bb3025946..b1d4487cb 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2740,6 +2740,13 @@ define([
         cntr.render();
 
         if(fld['type'] == 'checkbox') {
+          // Remove control label for keyboard shortcuts to
+          // align it properly.
+          let label = cntr.$el.find('label.control-label').text().trim();
+          if (label.length <= 0) {
+            cntr.$el.find('label.control-label').remove();
+          }
+
           if (fld['name'] == 'alt_option') {
             $container.append($('<div class="pg-el-sm-3 pg-el-xs-12"></div>').append(cntr.$el));
           } else {