diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 300830a13ff074c3462174b9663e624b41a9a5c8..338c2a65dee90d65f4eec059cf1d86ddfdbe940d 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -326,7 +326,6 @@ export class ActivitybarPart extends Part {
 	public shutdown(): void {
 		const state = this.viewletService.getViewlets().filter(viewlet => this.hasRegisteredViews(viewlet)).map(viewlet => ({ id: viewlet.id, iconUrl: viewlet.iconUrl }));
 		this.storageService.store(ActivitybarPart.PLACEHOLDER_VIEWLETS, JSON.stringify(state), StorageScope.GLOBAL);
-		this.compositeBar.shutdown();
 		super.shutdown();
 	}
 
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 23213cd2c12276290ecee162c44c3d38c7e3fa6c..57176fe9b29b7d828a02a1cef8e77d0573e2f83e 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -196,8 +196,6 @@ export class CompositeBar extends Widget implements ICompositeBar {
 	public pin(compositeId: string, open?: boolean): void {
 		if (this.model.setPinned(compositeId, true)) {
 			this.updateCompositeSwitcher();
-			// Persist
-			this.saveCompositeItems();
 
 			if (open) {
 				this.options.openComposite(compositeId)
@@ -210,8 +208,6 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		if (this.model.setPinned(compositeId, false)) {
 
 			this.updateCompositeSwitcher();
-			// Persist
-			this.saveCompositeItems();
 
 			const defaultCompositeId = this.options.getDefaultCompositeId();
 
@@ -254,11 +250,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 	public move(compositeId: string, toCompositeId: string): void {
 		if (this.model.move(compositeId, toCompositeId)) {
 			// timeout helps to prevent artifacts from showing up
-			setTimeout(() => {
-				this.updateCompositeSwitcher();
-				// Persist
-				this.saveCompositeItems();
-			}, 0);
+			setTimeout(() => this.updateCompositeSwitcher(), 0);
 		}
 	}
 
@@ -399,6 +391,9 @@ export class CompositeBar extends Widget implements ICompositeBar {
 
 			this.compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
 		}
+
+		// Persist
+		this.saveCompositeItems();
 	}
 
 	private getOverflowingComposites(): { id: string, name: string }[] {
@@ -452,10 +447,6 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this.storedState = this.model.toJSON();
 		this.storageService.store(this.options.storageId, JSON.stringify(this.storedState), StorageScope.GLOBAL);
 	}
-
-	public shutdown(): void {
-		this.saveCompositeItems();
-	}
 }
 
 interface ISerializedCompositeBarItem {
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 21552f02b5e57b3c267e96b04ee1ee2d1f6a27e2..c22eec7af839f8a9d87d87c7b165f5030218e279 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -237,11 +237,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return sizes;
 	}
 
-	public shutdown(): void {
-		this.compositeBar.shutdown();
-		super.shutdown();
-	}
-
 	private layoutCompositeBar(): void {
 		if (this.dimension) {
 			let availableWidth = this.dimension.width - 40; // take padding into account