diff --git a/web/pgadmin/misc/static/explain/js/explain.js b/web/pgadmin/misc/static/explain/js/explain.js
index 14ca76a158..58d112def9 100644
--- a/web/pgadmin/misc/static/explain/js/explain.js
+++ b/web/pgadmin/misc/static/explain/js/explain.js
@@ -1283,7 +1283,8 @@ define('pgadmin.misc.explain', [
         }).appendTo(graphicalContainer),
         zoomInBtn = $('<button></button>', {
           class: 'btn btn-secondary pg-explain-zoom-btn',
-          title: 'Zoom in',
+          title: gettext('Zoom in'),
+          'aria-label': gettext('Zoom in'),
           tabindex: 0,
         }).appendTo(zoomArea).append(
           $('<i></i>', {
@@ -1291,7 +1292,8 @@ define('pgadmin.misc.explain', [
           })),
         zoomToNormal = $('<button></button>', {
           class: 'btn btn-secondary pg-explain-zoom-btn',
-          title: 'Zoom to original',
+          title: gettext('Zoom to original'),
+          'aria-label': gettext('Zoom to original'),
           tabindex: 0,
         }).appendTo(zoomArea).append(
           $('<i></i>', {
@@ -1299,7 +1301,8 @@ define('pgadmin.misc.explain', [
           })),
         zoomOutBtn = $('<button></button>', {
           class: 'btn btn-secondary pg-explain-zoom-btn',
-          title: 'Zoom out',
+          title: gettext('Zoom out'),
+          'aria-label': gettext('Zoom out'),
           tabindex: 0,
         }).appendTo(zoomArea).append(
           $('<i></i>', {
@@ -1313,7 +1316,8 @@ define('pgadmin.misc.explain', [
         downloadBtn = $('<button></button>', {
           id: 'btn-explain-download',
           class: 'btn btn-secondary pg-explain-download-btn',
-          title: 'Download',
+          title: gettext('Download'),
+          'aria-label': gettext('Download'),
           tabindex: 0,
           disabled: function() {
             var current_browser = pgAdmin.Browser.get_browser();
@@ -1341,7 +1345,8 @@ define('pgadmin.misc.explain', [
       $('<button></button>', {
         id: 'btn-explain-stats',
         class: 'btn btn-secondary pg-explain-stats-btn',
-        title: 'Statistics',
+        title: gettext('Statistics'),
+        'aria-label': gettext('Statistics'),
         tabindex: 0,
       }).appendTo(statsArea).append(
         $('<i></i>', {
diff --git a/web/pgadmin/static/js/dialog_tab_navigator.js b/web/pgadmin/static/js/dialog_tab_navigator.js
index 5943711598..b3ffc996f7 100644
--- a/web/pgadmin/static/js/dialog_tab_navigator.js
+++ b/web/pgadmin/static/js/dialog_tab_navigator.js
@@ -19,7 +19,7 @@ class dialogTabNavigator {
 
     this.tabSwitching = false;
 
-    this.tabs = this.dialogContainer.find('.nav-tabs');
+    this.tabs = this.dialogContainer.find('.nav-tabs:visible');
 
     if (this.tabs.length > 0 ) {
       this.tabs = this.tabs[0];
@@ -35,7 +35,7 @@ class dialogTabNavigator {
 
   onKeyboardEvent(event, shortcut) {
     var currentTabPane =  this.dialogContainer
-        .find('.tab-content:first > .tab-pane.active:first'),
+        .find('.tab-content:first > .tab-pane.active:first:visible'),
       childTabData = this.isActivePaneHasChildTabs(currentTabPane);
 
     if (this.tabSwitching) {
@@ -57,12 +57,12 @@ class dialogTabNavigator {
   }
 
   isActivePaneHasChildTabs(currentTabPane) {
-    var childTab = currentTabPane.find('.nav-tabs:first'),
+    var childTab = currentTabPane.find('.nav-tabs:first:visible'),
       childTabPane;
 
     if (childTab.length > 0) {
       childTabPane = currentTabPane
-        .find('.tab-content:first > .tab-pane.active:first');
+        .find('.tab-content:first > .tab-pane.active:first:visible');
 
       return {
         'childTab': childTab,
@@ -93,7 +93,7 @@ class dialogTabNavigator {
 
       nextTabPane = tab_pane.prev();
       innerTabContainer = nextTabPane
-        .find('.tab-content:first > .tab-pane.active:first');
+        .find('.tab-content:first > .tab-pane.active:first:visible');
 
       if (innerTabContainer.length > 0) {
         findAndSetFocus(innerTabContainer);
@@ -124,7 +124,7 @@ class dialogTabNavigator {
 
       nextTabPane = tab_pane.next();
       innerTabContainer = nextTabPane
-        .find('.tab-content:first > .tab-pane.active:first');
+        .find('.tab-content:first > .tab-pane.active:first:visible');
 
       if (innerTabContainer.length > 0) {
         findAndSetFocus(innerTabContainer);