diff --git a/src/sql/workbench/parts/notebook/notebook.css b/src/sql/workbench/parts/notebook/notebook.css
index a659f8cf71..5debe9b14b 100644
--- a/src/sql/workbench/parts/notebook/notebook.css
+++ b/src/sql/workbench/parts/notebook/notebook.css
@@ -42,6 +42,7 @@
 
 .notebookEditor .labelOnLeftContainer {
 	min-width: 100px;
+	max-width: 250px;
 	margin-right: 20px;
 	font-size: 13px;
 	text-align: center;
diff --git a/src/sql/workbench/parts/notebook/notebookActions.ts b/src/sql/workbench/parts/notebook/notebookActions.ts
index 8c012920d3..6558169b4f 100644
--- a/src/sql/workbench/parts/notebook/notebookActions.ts
+++ b/src/sql/workbench/parts/notebook/notebookActions.ts
@@ -409,14 +409,13 @@ export class AttachToDropdown extends SelectBox {
 			else {
 				if (connections.length === 1 && connections[0] === msgAddNewConnection) {
 					connections.unshift(msgSelectConnection);
-					this.selectWithOptionName(msgSelectConnection);
 				}
 				else {
 					if (!connections.includes(msgAddNewConnection)) {
 						connections.push(msgAddNewConnection);
 					}
 				}
-				this.setOptions(connections);
+				this.setOptions(connections, 0);
 			}
 		}
 	}
@@ -426,11 +425,11 @@ export class AttachToDropdown extends SelectBox {
 			if (!connections.includes(msgSelectConnection)) {
 				connections.unshift(msgSelectConnection);
 			}
-			this.selectWithOptionName(msgSelectConnection);
+
 			if (!connections.includes(msgAddNewConnection)) {
 				connections.push(msgAddNewConnection);
 			}
-			this.setOptions(connections);
+			this.setOptions(connections, 0);
 		}
 		return connections;
 	}