diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index 1f3b102ebb1..6fc44ed872a 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -183,6 +183,10 @@
 	background-color: var(--vscode-statusBarItem-warningBackground);
 }
 
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item.warning-kind.has-command:hover {
+	background-color: var(--vscode-statusBarItem-warningHoverBackground);
+}
+
 .monaco-workbench .part.statusbar > .items-container > .statusbar-item.warning-kind a:hover:not(.disabled) {
 	color: var(--vscode-statusBarItem-warningHoverForeground);
 	background-color: var(--vscode-statusBarItem-warningHoverBackground) !important;
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index 5c827aa15d1..bbee47f5a3a 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -165,8 +165,10 @@ export class StatusbarEntryItem extends Disposable {
 					}
 				});
 
+				this.container.classList.add('has-command');
 				this.labelContainer.classList.remove('disabled');
 			} else {
+				this.container.classList.remove('has-command');
 				this.labelContainer.classList.add('disabled');
 			}
 		}