diff --git a/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts b/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
index 502f591879..3372f78435 100644
--- a/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
+++ b/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
@@ -211,8 +211,8 @@ export class MainThreadModelViewDialog implements MainThreadModelViewDialogShape
 
 	public $setWizardPage(wizardHandle: number, pageIndex: number): Thenable<void> {
 		let wizard = this.getWizard(wizardHandle);
-		wizard.setCurrentPage(pageIndex);
-		return Promise.resolve();
+		const modal = this._dialogService.getWizardModal(wizard);
+		return modal.showPage(pageIndex);
 	}
 
 	public $openWizard(handle: number): Thenable<void> {
diff --git a/src/sql/workbench/services/dialog/browser/customDialogService.ts b/src/sql/workbench/services/dialog/browser/customDialogService.ts
index c21ec0ae9f..6f889c2f89 100644
--- a/src/sql/workbench/services/dialog/browser/customDialogService.ts
+++ b/src/sql/workbench/services/dialog/browser/customDialogService.ts
@@ -34,16 +34,14 @@ export class CustomDialogService {
 	}
 
 	public closeDialog(dialog: Dialog): void {
-		let dialogModal = this._dialogModals.get(dialog);
-		if (dialogModal) {
-			dialogModal.cancel();
-		}
+		this._dialogModals.get(dialog)?.cancel();
 	}
 
 	public closeWizard(wizard: Wizard): void {
-		let wizardModal = this._wizardModals.get(wizard);
-		if (wizardModal) {
-			wizardModal.cancel();
-		}
+		this._wizardModals.get(wizard)?.cancel();
+	}
+
+	public getWizardModal(wizard: Wizard): WizardModal | undefined {
+		return this._wizardModals.get(wizard);
 	}
 }
diff --git a/src/sql/workbench/services/dialog/browser/wizardModal.ts b/src/sql/workbench/services/dialog/browser/wizardModal.ts
index 0a8eeb500d..9b3382d2d7 100644
--- a/src/sql/workbench/services/dialog/browser/wizardModal.ts
+++ b/src/sql/workbench/services/dialog/browser/wizardModal.ts
@@ -176,7 +176,7 @@ export class WizardModal extends Modal {
 		page.onUpdate(() => this.setButtonsForPage(this._wizard.currentPage));
 	}
 
-	private async showPage(index: number, validate: boolean = true, focus: boolean = false): Promise<void> {
+	public async showPage(index: number, validate: boolean = true, focus: boolean = false): Promise<void> {
 		let pageToShow = this._wizard.pages[index];
 		if (!pageToShow) {
 			this.done(validate).catch(err => onUnexpectedError(err));