diff --git a/src/sql/workbench/browser/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts
index f79da8b441..dd03ce5cb4 100644
--- a/src/sql/workbench/browser/modal/optionsDialog.ts
+++ b/src/sql/workbench/browser/modal/optionsDialog.ts
@@ -192,7 +192,6 @@ export class OptionsDialog extends Modal {
 
 	public open(options: azdata.ServiceOption[], optionValues: { [name: string]: any }) {
 		this._optionValues = optionValues;
-		let firstOption: string | undefined;
 		let categoryMap = OptionsDialogHelper.groupOptionsByCategory(options);
 		clearNode(this._optionGroupsContainer!);
 		for (let category in categoryMap) {
@@ -204,16 +203,10 @@ export class OptionsDialog extends Modal {
 			let bodyContainer = $('table.optionsDialog-table');
 			this.fillInOptions(bodyContainer, serviceOptions);
 			append(this._optionGroupsContainer!, bodyContainer);
-
-			if (!firstOption) {
-				firstOption = serviceOptions[0].name;
-			}
 		}
 		this.updateTheme(this._themeService.getColorTheme());
-		this.show();
-		let firstOptionWidget = this._optionElements[firstOption!].optionWidget;
 		this.registerStyling();
-		setTimeout(() => firstOptionWidget.focus(), 1);
+		this.show();
 	}
 
 	protected layout(height?: number): void {