diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index ab4e44c096d..3f68e839a54 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -603,7 +603,6 @@ export class StatusbarPart extends Part implements IStatusbarService {
 
 	private doCreateStatusItem(id: string, name: string, alignment: StatusbarAlignment, priority: number = 0, ...extraClasses: string[]): HTMLElement {
 		const itemContainer = document.createElement('div');
-		itemContainer.title = name;
 		itemContainer.id = id;
 
 		addClass(itemContainer, 'statusbar-item');
@@ -683,12 +682,12 @@ class StatusbarEntryItem extends Disposable {
 			}
 		}
 
-		// Update: Tooltip
+		// Update: Tooltip (on the container, because label can be disabled)
 		if (!this.entry || entry.tooltip !== this.entry.tooltip) {
 			if (entry.tooltip) {
-				this.labelContainer.title = entry.tooltip;
+				this.container.title = entry.tooltip;
 			} else {
-				delete this.labelContainer.title;
+				delete this.container.title;
 			}
 		}
 
diff --git a/test/smoke/src/areas/statusbar/statusbar.ts b/test/smoke/src/areas/statusbar/statusbar.ts
index c9bfa19bc5c..a93976396c2 100644
--- a/test/smoke/src/areas/statusbar/statusbar.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.ts
@@ -50,15 +50,15 @@ export class StatusBar {
 			case StatusBarElement.PROBLEMS_STATUS:
 				return `${this.mainSelector} ${this.leftSelector} .octicon.octicon-error`;
 			case StatusBarElement.SELECTION_STATUS:
-				return `${this.mainSelector} ${this.rightSelector} a[title="Go to Line"]`;
+				return `${this.mainSelector} ${this.rightSelector}[title="Go to Line"]`;
 			case StatusBarElement.INDENTATION_STATUS:
-				return `${this.mainSelector} ${this.rightSelector} a[title="Select Indentation"]`;
+				return `${this.mainSelector} ${this.rightSelector}[title="Select Indentation"]`;
 			case StatusBarElement.ENCODING_STATUS:
-				return `${this.mainSelector} ${this.rightSelector} a[title="Select Encoding"]`;
+				return `${this.mainSelector} ${this.rightSelector}[title="Select Encoding"]`;
 			case StatusBarElement.EOL_STATUS:
-				return `${this.mainSelector} ${this.rightSelector} a[title="Select End of Line Sequence"]`;
+				return `${this.mainSelector} ${this.rightSelector}[title="Select End of Line Sequence"]`;
 			case StatusBarElement.LANGUAGE_STATUS:
-				return `${this.mainSelector} ${this.rightSelector} a[title="Select Language Mode"]`;
+				return `${this.mainSelector} ${this.rightSelector}[title="Select Language Mode"]`;
 			case StatusBarElement.FEEDBACK_ICON:
 				return `${this.mainSelector} ${this.rightSelector} .monaco-dropdown.send-feedback`;
 			default: