diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
index 2691640..5802709 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
@@ -176,11 +176,11 @@ define([
                 setup:function() {
                   return {
                      buttons: [{
-                       text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                       text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                        attrs:{name:'dialog_help', type:'button', label: gettext('Users'),
                        url: '{{ url_for('help.static', filename='move_objects.html') }}'}
                        },{
-                       text: gettext('OK'), key: 27, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button'
+                       text: gettext('OK'), key: 13, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button'
                        },{
                        text: gettext('Cancel'), key: 27, className: 'btn btn-danger fa fa-lg fa-times pg-alertify-button'
                      }],
diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
index 5ff911b..725e14e 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
+++ b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
@@ -403,7 +403,7 @@ define([
                  setup:function() {
                   return {
                     buttons: [{
-                      text: gettext('Ok'), key: 27, className: 'btn btn-primary', attrs:{name:'submit'}
+                      text: gettext('Ok'), key: 13, className: 'btn btn-primary', attrs:{name:'submit'}
                       },{
                       text: gettext('Cancel'), key: 27, className: 'btn btn-danger', attrs:{name:'cancel'}
                     }],
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js
index aaee478..0763849 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js
@@ -254,7 +254,7 @@ define([
               return {
                 buttons:[
                   {
-                    text: gettext("Select"), className: "btn btn-primary fa fa-file file_manager_ok pg-alertify-button disabled"
+                    text: gettext("Select"), key: 13, className: "btn btn-primary fa fa-file file_manager_ok pg-alertify-button disabled"
                   },
                   {
                     text: gettext("Cancel"), key: 27, className: "btn btn-danger fa fa-times pg-alertify-button"
@@ -379,7 +379,7 @@ define([
               return {
                 buttons:[
                   {
-                    text: gettext("Select"), className: "btn btn-primary fa fa-file file_manager_ok pg-alertify-button disabled"
+                    text: gettext("Select"), key: 13, className: "btn btn-primary fa fa-file file_manager_ok pg-alertify-button disabled"
                   },
                   {
                     text: gettext("Cancel"), key: 27, className: "btn btn-danger fa fa-times pg-alertify-button"
@@ -502,7 +502,7 @@ define([
               return {
                 buttons:[
                   {
-                    text: gettext("Create"), className: "btn btn-primary fa fa-file file_manager_create file_manager_ok pg-alertify-button disabled"
+                    text: gettext("Create"), key: 13, className: "btn btn-primary fa fa-file file_manager_create file_manager_ok pg-alertify-button disabled"
                   },
                   {
                     text: gettext("Cancel"), key: 27, className: "btn btn-danger fa fa-times file_manager_create_cancel pg-alertify-button"
diff --git a/web/pgadmin/preferences/templates/preferences/preferences.js b/web/pgadmin/preferences/templates/preferences/preferences.js
index 997273c..33b1458 100644
--- a/web/pgadmin/preferences/templates/preferences/preferences.js
+++ b/web/pgadmin/preferences/templates/preferences/preferences.js
@@ -354,13 +354,13 @@ define([
             setup: function() {
               return {
                 buttons:[{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                    text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                     attrs:{name:'dialog_help', type:'button', label: gettext('Preferences'),
                     url: '{{ url_for('help.static', filename='preferences.html') }}'}
                   },{
                     text: gettext('OK'), key: 13, className: "btn btn-primary fa fa-lg fa-save pg-alertify-button"
                   },{
-                    text: gettext('Cancel'), className: "btn btn-danger fa fa-lg fa-times pg-alertify-button"
+                    text: gettext('Cancel'), key: 27, className: "btn btn-danger fa fa-lg fa-times pg-alertify-button"
                   }
                 ],
                 focus: { element: 0 },
diff --git a/web/pgadmin/tools/backup/templates/backup/js/backup.js b/web/pgadmin/tools/backup/templates/backup/js/backup.js
index a3438cf..dac96a8 100644
--- a/web/pgadmin/tools/backup/templates/backup/js/backup.js
+++ b/web/pgadmin/tools/backup/templates/backup/js/backup.js
@@ -437,15 +437,15 @@ TODO LIST FOR BACKUP:
                setup:function() {
                 return {
                   buttons: [{
-                      text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-info',
+                      text: '', className: 'btn btn-default pull-left fa fa-lg fa-info',
                       attrs:{name:'object_help', type:'button', url: 'backup.html', label: gettext('Backup')}
                     },{
-                      text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                      text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                       attrs:{name:'dialog_help', type:'button', label: gettext('Backup'),
                       url: '{{ url_for('help.static', filename='backup_dialog.html') }}'
                       }
                     },{
-                      text: gettext('Backup'), key: 27, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button',
+                      text: gettext('Backup'), key: 13, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button',
                       'data-btn-name': 'backup'
                     },{
                       text: gettext('Cancel'), key: 27, className: 'btn btn-danger fa fa-lg fa-times pg-alertify-button',
@@ -653,14 +653,14 @@ TODO LIST FOR BACKUP:
                setup:function() {
                 return {
                   buttons: [{
-                      text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-info',
+                      text: '', className: 'btn btn-default pull-left fa fa-lg fa-info',
                       attrs:{name:'object_help', type:'button', url: 'backup.html', label: gettext('Backup')}
                     },{
-                      text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                      text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                       attrs:{name:'dialog_help', type:'button', label: gettext('Backup'),
                       url: '{{ url_for('help.static', filename='backup_dialog.html') }}'}
                     },{
-                      text: gettext('Backup'), key: 27, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button',
+                      text: gettext('Backup'), key: 13, className: 'btn btn-primary fa fa-lg fa-save pg-alertify-button',
                       'data-btn-name': 'backup'
                     },{
                       text: gettext('Cancel'), key: 27, className: 'btn btn-danger fa fa-lg fa-times pg-alertify-button',
diff --git a/web/pgadmin/tools/debugger/templates/debugger/js/debugger_ui.js b/web/pgadmin/tools/debugger/templates/debugger/js/debugger_ui.js
index 8d71169..cfbba13 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/templates/debugger/js/debugger_ui.js
@@ -428,7 +428,7 @@ define([
           },
           setup:function() {
             return {
-              buttons:[{ text: "Debug", key: 27, className: "btn btn-primary" },
+              buttons:[{ text: "Debug", key: 13, className: "btn btn-primary" },
                        { text: "Cancel", key: 27, className: "btn btn-primary" }],
               options: { modal: 0, resizable: true }
             };
diff --git a/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js b/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
index 390a324..d8a8c13 100644
--- a/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
+++ b/web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
@@ -375,7 +375,7 @@ define([
               setup: function() {
                 return {
                   buttons:[{
-                    text: gettext("OK"), key: 27, disable: true,
+                    text: gettext("OK"), key: 13, disable: true,
                     'data-btn-name': 'ok',
                     className:
                       "btn btn-primary fa fa-lg fa-save pg-alertify-button"
diff --git a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
index e22c424..ab6e844 100644
--- a/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
@@ -264,14 +264,14 @@ define([
               setup: function() {
                 return {
                   buttons:[{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-info',
+                    text: '', className: 'btn btn-default pull-left fa fa-lg fa-info',
                     attrs:{name:'object_help', type:'button', url: 'maintenance.html', label: gettext('Maintenance')}
                   },{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                    text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                     attrs:{name:'dialog_help', type:'button', label: gettext('Maintenance'),
                     url: '{{ url_for('help.static', filename='maintenance_dialog.html') }}'}
                   },{
-                    text: gettext("OK"), key: 27, className: "btn btn-primary fa fa-lg fa-save pg-alertify-button",
+                    text: gettext("OK"), key: 13, className: "btn btn-primary fa fa-lg fa-save pg-alertify-button",
                     'data-btn-name': 'ok',
                   },{
                     text: gettext("Cancel"), key: 27, className: "btn btn-danger fa fa-lg fa-times pg-alertify-button",
diff --git a/web/pgadmin/tools/restore/templates/restore/js/restore.js b/web/pgadmin/tools/restore/templates/restore/js/restore.js
index b2d58e8..552ccf9 100644
--- a/web/pgadmin/tools/restore/templates/restore/js/restore.js
+++ b/web/pgadmin/tools/restore/templates/restore/js/restore.js
@@ -366,14 +366,14 @@ define([
                setup:function() {
                 return {
                   buttons: [{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-info',
+                    text: '', className: 'btn btn-default pull-left fa fa-lg fa-info',
                     attrs:{name:'object_help', type:'button', url: 'backup.html', label: gettext('Restore')}
                   },{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                    text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                     attrs:{name:'dialog_help', type:'button', label: gettext('Restore'),
                     url: '{{ url_for('help.static', filename='restore_dialog.html') }}'}
                   },{
-                    text: gettext('Restore'), key: 27,
+                    text: gettext('Restore'), key: 13,
                     className: 'btn btn-primary fa fa-upload pg-alertify-button', restore: true,
                     'data-btn-name': 'restore'
                   },{
diff --git a/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js b/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
index fbd5e17..330a027 100644
--- a/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
+++ b/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
@@ -380,7 +380,7 @@ define([
               setup:function() {
                 return {
                   buttons: [{
-                    text: '', key: 27, className: 'btn btn-default pull-left fa fa-lg fa-question',
+                    text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
                     attrs:{name:'dialog_help', type:'button', label: gettext('Users'),
                     url: '{{ url_for('help.static', filename='pgadmin_user.html') }}'}
                   },{