diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 08dc54643ee2..61bb1e3607f3 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -99,6 +99,7 @@ export class CompositeBar implements ICompositeBar {
 		}
 
 		this.options.composites = this.options.composites.filter(c => c.id !== id);
+		this.deactivateComposite(id);
 		this.unpin(id);
 		this.pullComposite(id);
 	}
@@ -123,6 +124,12 @@ export class CompositeBar implements ICompositeBar {
 		if (this.compositeIdToActions[id]) {
 			this.compositeIdToActions[id].deactivate();
 		}
+		if (this.activeCompositeId === id) {
+			this.activeCompositeId = undefined;
+		}
+		if (this.activeUnpinnedCompositeId === id) {
+			this.activeUnpinnedCompositeId = undefined;
+		}
 	}
 
 	public showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {