diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index e0d688828b36b84349d029deaea41685367dbed2..16fb5a61bb2ec378ad72f87d8c3c52428645211a 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -199,11 +199,9 @@ class StatusbarViewModel extends Disposable {
 			const id = arg1;
 
 			for (const entry of this._entries) {
-				if (entry.id !== id) {
-					continue;
+				if (entry.id === id) {
+					this.updateVisibility(entry);
 				}
-
-				this.updateVisibility(entry);
 			}
 		}
 
@@ -558,6 +556,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		this.viewModel.entries.forEach(entry => {
 			if (!handledEntries.has(entry.id)) {
 				actions.push(new ToggleStatusbarEntryVisibilityAction(entry.id, entry.name, this.viewModel));
+				handledEntries.add(entry.id);
 			}
 		});