diff --git a/web/pgadmin/static/js/utils.js b/web/pgadmin/static/js/utils.js index 6cbb68a5..7b99c9b8 100644 --- a/web/pgadmin/static/js/utils.js +++ b/web/pgadmin/static/js/utils.js @@ -28,7 +28,10 @@ export function findAndSetFocus(container) { if (first_el.length == 0) { first_el = container - .find('.pgadmin-controls:first input:enabled,.CodeMirror-scroll'); + .find(` + .pgadmin-controls:first input:enabled, + .pgadmin-controls:first .btn:not(.toggle), + .CodeMirror-scroll`); } if(first_el.length > 0) { @@ -69,4 +72,4 @@ export function getGCD(inp_arr) { } return result; -} \ No newline at end of file +} diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js index 4fbdf882..74499d11 100644 --- a/web/pgadmin/tools/import_export/static/js/import_export.js +++ b/web/pgadmin/tools/import_export/static/js/import_export.js @@ -591,6 +591,11 @@ define([ break; } }, + + onshow: function() { + var container = $(this.elements.body).find('.tab-content:first > .tab-pane.active:first'); + commonUtils.findAndSetFocus(container); + }, }, prepare: function() { @@ -656,8 +661,6 @@ define([ }); view.$el.attr('tabindex', -1); - var container = view.$el.find('.tab-content:first > .tab-pane.active:first'); - commonUtils.findAndSetFocus(container); setTimeout(function() { pgBrowser.keyboardNavigation.getDialogTabNavigator($(self.elements.dialog)); }, 200); diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js index 4d696c31..2311b506 100644 --- a/web/pgadmin/tools/maintenance/static/js/maintenance.js +++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js @@ -76,18 +76,24 @@ define([ '