diff --git a/extensions/resource-deployment/src/main.ts b/extensions/resource-deployment/src/main.ts
index b1ed3fdafc..3c2b13d019 100644
--- a/extensions/resource-deployment/src/main.ts
+++ b/extensions/resource-deployment/src/main.ts
@@ -49,7 +49,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		if (typeof resourceType === 'string') {
 			openDialog(resourceType);
 		} else {
-			openDialog('sql-image');
+			let defaultDeploymentType: string;
+			if (platformService.platform() === 'win32') {
+				defaultDeploymentType = 'sql-windows-setup';
+			} else {
+				defaultDeploymentType = 'sql-image';
+			}
+			openDialog(defaultDeploymentType);
 		}
 	});
 	vscode.commands.registerCommand('azdata.openNotebookInputDialog', (dialogInfo: NotebookBasedDialogInfo) => {
diff --git a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts
index 121d470f9a..d18f18eb7d 100644
--- a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts
+++ b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts
@@ -206,6 +206,7 @@ export class ResourceTypePickerDialog extends DialogBase {
 		}
 		this._installToolButton.hidden = true;
 		if (this.toolRequirements.length === 0) {
+			this._toolsLoadingComponent.loading = false;
 			this._dialogObject.okButton.enabled = true;
 			this._toolsTable.data = [[localize('deploymentDialog.NoRequiredTool', "No tools required"), '']];
 			this._tools = [];