diff --git a/js/src/shortcuts_handler.js b/js/src/shortcuts_handler.js
index 49db60f13c..bd1b661e00 100644
--- a/js/src/shortcuts_handler.js
+++ b/js/src/shortcuts_handler.js
@@ -78,13 +78,13 @@ $(function () {
                 isTable = CommonParams.get('table');
                 isDb = CommonParams.get('db');
                 if (isDb && ! isTable) {
-                    $('.tab .ic_b_props').first().trigger('click');
+                    $('.nav-link .ic_b_props').first().trigger('click');
                 }
             } else if (tableOp === true) {
                 isTable = CommonParams.get('table');
                 isDb = CommonParams.get('db');
                 if (isDb && isTable) {
-                    $('.tab .ic_b_props').first().trigger('click');
+                    $('.nav-link .ic_b_props').first().trigger('click');
                 }
             } else {
                 $('#pma_navigation_settings_icon').trigger('click');
@@ -94,13 +94,13 @@ $(function () {
                 isTable = CommonParams.get('table');
                 isDb = CommonParams.get('db');
                 if (isDb && ! isTable) {
-                    $('.tab .ic_b_search').first().trigger('click');
+                    $('.nav-link .ic_b_search').first().trigger('click');
                 }
             } else if (tableOp === true) {
                 isTable = CommonParams.get('table');
                 isDb = CommonParams.get('db');
                 if (isDb && isTable) {
-                    $('.tab .ic_b_search').first().trigger('click');
+                    $('.nav-link .ic_b_search').first().trigger('click');
                 }
             }
         } else if (e.keyCode === keyT) {