From 24af5db4a297af9789939b03d17fc2fd87947cf6 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 25 Apr 2023 12:53:58 -0700
Subject: [PATCH] Fix resetting tenant when dropdown is not visible (#22845)

---
 .../workbench/services/connection/browser/connectionWidget.ts  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts
index 4e60cdc3fe..e9bbd2fc3d 100644
--- a/src/sql/workbench/services/connection/browser/connectionWidget.ts
+++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts
@@ -813,7 +813,10 @@ export class ConnectionWidget extends lifecycle.Disposable {
 
 		} else {
 			if (selectedAccount && selectedAccount.properties.tenants && selectedAccount.properties.tenants.length === 1) {
+				let options = selectedAccount.properties.tenants.map(tenant => tenant.displayName);
+				this._azureTenantDropdown.setOptions(options);
 				this._azureTenantId = selectedAccount.properties.tenants[0].id;
+				this.onAzureTenantSelected(0);
 			}
 			this._tableContainer.classList.add(hideTenantsClassName);
 		}