diff --git a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts
index fc3c2c3935..db17e6480c 100644
--- a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts
+++ b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts
@@ -171,13 +171,17 @@ export class AccountDialog extends Modal {
 		if (!this.isEmptyLinkedAccount()) {
 			this.showSplitView();
 		} else {
-			this._splitViewContainer.hidden = true;
-			this._noaccountViewContainer.hidden = false;
-			this._addAccountButton.focus();
+			this.showNoAccountContainer();
 		}
 
 	}
 
+	private showNoAccountContainer() {
+		this._splitViewContainer.hidden = true;
+		this._noaccountViewContainer.hidden = false;
+		this._addAccountButton.focus();
+	}
+
 	private showSplitView() {
 		this._splitViewContainer.hidden = false;
 		this._noaccountViewContainer.hidden = true;
@@ -298,6 +302,10 @@ export class AccountDialog extends Modal {
 			this.showSplitView();
 		}
 
+		if (this.isEmptyLinkedAccount() && this._noaccountViewContainer.hidden) {
+			this.showNoAccountContainer();
+		}
+
 		this.layout();
 	}
 }