diff --git a/extensions/mssql/src/ui/scriptableDialogBase.ts b/extensions/mssql/src/ui/scriptableDialogBase.ts
index ef94c408c2..7d6c448884 100644
--- a/extensions/mssql/src/ui/scriptableDialogBase.ts
+++ b/extensions/mssql/src/ui/scriptableDialogBase.ts
@@ -63,13 +63,16 @@ export abstract class ScriptableDialogBase<OptionsType extends ScriptableDialogO
 	protected abstract get isDirty(): boolean;
 
 	protected override onFormFieldChange(): void {
-		this._scriptButton.enabled = this.isDirty;
+		this.updateScriptButtonState();
 		this.dialogObject.okButton.enabled = this.isDirty;
 	}
 
 	protected override async initialize(): Promise<void> {
 		await this.initializeData();
 		await this.initializeUI();
+		this.disposables.push(this.modelView.onValidityChanged(() => {
+			this.updateScriptButtonState();
+		}));
 	}
 
 	protected override updateLoadingStatus(isLoading: boolean, loadingText?: string, loadingCompletedText?: string): void {
@@ -131,4 +134,8 @@ export abstract class ScriptableDialogBase<OptionsType extends ScriptableDialogO
 			this.updateLoadingStatus(false, localizedConstants.GeneratingScriptText, localizedConstants.GeneratingScriptCompletedText);
 		}
 	}
+
+	private updateScriptButtonState(): void {
+		this._scriptButton.enabled = this.isDirty && this.modelView.valid;
+	}
 }