diff --git a/src/sql/workbench/contrib/notebook/browser/notebookActions.ts b/src/sql/workbench/contrib/notebook/browser/notebookActions.ts
index 71c302cc1f..382407bf23 100644
--- a/src/sql/workbench/contrib/notebook/browser/notebookActions.ts
+++ b/src/sql/workbench/contrib/notebook/browser/notebookActions.ts
@@ -480,7 +480,7 @@ export class AttachToDropdown extends SelectBox {
 			}
 			let connection = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService,
 				{
-					connectionType: ConnectionType.temporary,
+					connectionType: ConnectionType.editor,
 					providers: providers
 				},
 				useProfile ? this.model.connectionProfile : undefined);
diff --git a/src/sql/workbench/services/connection/browser/connectionDialogService.ts b/src/sql/workbench/services/connection/browser/connectionDialogService.ts
index b256edff42..f3feddd44f 100644
--- a/src/sql/workbench/services/connection/browser/connectionDialogService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionDialogService.ts
@@ -381,7 +381,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
 		newProfile.saveProfile = true;
 		newProfile.generateNewId();
 		// If connecting from a query editor set "save connection" to false
-		if (this._params && this._params.input && this._params.connectionType === ConnectionType.editor) {
+		if (this._params?.connectionType === ConnectionType.editor) {
 			newProfile.saveProfile = false;
 		}
 		return newProfile;