diff --git a/src/sql/base/browser/ui/taskbar/media/taskbar.css b/src/sql/base/browser/ui/taskbar/media/taskbar.css
index 3bc1c12928..18bf76116a 100644
--- a/src/sql/base/browser/ui/taskbar/media/taskbar.css
+++ b/src/sql/base/browser/ui/taskbar/media/taskbar.css
@@ -78,14 +78,13 @@
 .taskbarSeparator {
 	min-width: 1px;
 	background-color:#A5A5A5;
-	margin: 0px 16px;
+	margin: 0px 8px;
 	align-self: stretch;
 }
 
 .taskbarTextSeparator {
 	margin-left: 3px;
 	margin-right: 3px;
-	margin-top: 4px;
 }
 
 /* Taskbar Icons */
diff --git a/src/sql/workbench/contrib/query/browser/queryEditor.ts b/src/sql/workbench/contrib/query/browser/queryEditor.ts
index ea5da92e97..3e9f760d2c 100644
--- a/src/sql/workbench/contrib/query/browser/queryEditor.ts
+++ b/src/sql/workbench/contrib/query/browser/queryEditor.ts
@@ -309,7 +309,6 @@ export class QueryEditor extends EditorPane {
 		const content: ITaskbarContent[] = [
 			{ action: this._runQueryAction },
 			{ action: this._cancelQueryAction },
-			{ element: Taskbar.createTaskbarSeparator() },
 			{ action: this._toggleConnectDatabaseAction },
 			{ action: this._changeConnectionAction }
 		];
@@ -327,6 +326,8 @@ export class QueryEditor extends EditorPane {
 		// Only show the databases dropdown if the connection provider supports it.
 		// If the provider we're using isn't registered yet then default to not showing it - we'll update once the provider is registered
 		if (this.capabilitiesService.getCapabilities(providerId)?.connection?.connectionOptions?.find(option => option.specialValueType === ConnectionOptionSpecialType.databaseName)) {
+			content.push({ element: Taskbar.createTaskbarSeparator() });
+			content.push({ element: Taskbar.createTaskbarText(localize("queryActions.selectDatabase.label", "Database:")) });
 			content.push({ action: this._listDatabasesAction });
 		}