diff --git a/src/sql/workbench/browser/modal/modal.ts b/src/sql/workbench/browser/modal/modal.ts
index f796606fda..b0a7076377 100644
--- a/src/sql/workbench/browser/modal/modal.ts
+++ b/src/sql/workbench/browser/modal/modal.ts
@@ -613,6 +613,7 @@ export abstract class Modal extends Disposable implements IThemable {
 		if (visible) {
 			if (this._useDefaultMessageBoxLocation) {
 				DOM.prepend(this._modalContent!, this._messageElement!);
+				this.setInitialFocusedElement();
 			}
 		} else {
 			// only do the removal when the messageElement has parent element.