diff --git a/src/sql/parts/editData/common/editDataInput.ts b/src/sql/parts/editData/common/editDataInput.ts
index c53df2f445..833337ffec 100644
--- a/src/sql/parts/editData/common/editDataInput.ts
+++ b/src/sql/parts/editData/common/editDataInput.ts
@@ -186,6 +186,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 
 		this._queryModelService.initializeEdit(this.uri, this.schemaName, this.tableName, this._objectType, rowLimit, queryString);
 		this.showResultsEditor();
+		this._onDidChangeLabel.fire();
 	}
 
 	public onDisconnect(): void {
diff --git a/src/sql/parts/query/common/queryInput.ts b/src/sql/parts/query/common/queryInput.ts
index a095265580..bf430b32a0 100644
--- a/src/sql/parts/query/common/queryInput.ts
+++ b/src/sql/parts/query/common/queryInput.ts
@@ -246,6 +246,7 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
 			}
 		}
 		this._updateTaskbar.fire();
+		this._onDidChangeLabel.fire();
 	}
 
 	public onDisconnect(): void {
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index d09c2ec571..85bde7ce9e 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -868,6 +868,9 @@ export class TabsTitleControl extends TitleControl {
 
 		// Dirty State
 		this.redrawEditorDirty(editor, tabContainer);
+
+		// {{SQL CARBON EDIT}} -- Display the editor's tab color
+		this.setEditorTabColor(editor, tabContainer, this.group.isActive(editor));
 	}
 
 	private redrawLabel(editor: IEditorInput, tabContainer: HTMLElement, tabLabelWidget: ResourceLabel, tabLabel: IEditorInputLabel): void {
@@ -880,7 +883,8 @@ export class TabsTitleControl extends TitleControl {
 		tabContainer.title = title;
 
 		// Label
-		tabLabelWidget.setLabel({ name, description, resource: toResource(editor, { supportSideBySide: true }) }, { extraClasses: ['tab-label'], italic: !this.group.isPinned(editor) });
+		// {{SQL CARBON EDIT}} -- add title in options passed
+		tabLabelWidget.setLabel({ name, description, resource: toResource(editor, { supportSideBySide: true }) }, { extraClasses: ['tab-label'], italic: !this.group.isPinned(editor), title });
 
 		// {{SQL CARBON EDIT}} -- Display the editor's tab color
 		const isTabActive = this.group.isActive(editor);
@@ -1105,10 +1109,12 @@ export class TabsTitleControl extends TitleControl {
 			|| this.themeService.getTheme().type === HIGH_CONTRAST || !sqlEditor.tabColor) {
 			tabContainer.style.borderTopColor = '';
 			tabContainer.style.borderTopWidth = '';
+			tabContainer.style.borderTopStyle = '';
 			return;
 		}
 		tabContainer.style.borderTopColor = sqlEditor.tabColor;
 		tabContainer.style.borderTopWidth = isTabActive ? '3px' : '2px';
+		tabContainer.style.borderTopStyle = 'solid';
 		if (tabColorMode === QueryConstants.tabColorModeFill) {
 			let backgroundColor = Color.Format.CSS.parseHex(sqlEditor.tabColor);
 			if (backgroundColor) {