diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index b17221162b8f9d0e9241d7ead8d50c34922ce88f..d298147bd8ea65388f8407361f4eb29c4bd6d497 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -24,7 +24,7 @@ const MIN_SIDEBAR_PART_WIDTH = 170;
 const MIN_EDITOR_PART_HEIGHT = 70;
 const MIN_EDITOR_PART_WIDTH = 220;
 const MIN_PANEL_PART_HEIGHT = 77;
-const MIN_PANEL_PART_WIDTH = 150;
+const MIN_PANEL_PART_WIDTH = 220;
 const DEFAULT_PANEL_SIZE_COEFFICIENT = 0.4;
 const HIDE_SIDEBAR_WIDTH_THRESHOLD = 50;
 const HIDE_PANEL_HEIGHT_THRESHOLD = 50;
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index bbc336984018ec8f1fbf855065452bbc48031e07..2a1a311acfee0aef105014187f0f7a0cb32e13f9 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -281,7 +281,7 @@ export class CompositeBar implements ICompositeBar {
 		}
 
 		// Add overflow action as needed
-		if (visibleCompositesChange && overflows) {
+		if ((visibleCompositesChange && overflows) || this.compositeSwitcherBar.length() === 0) {
 			this.compositeOverflowAction = this.instantiationService.createInstance(CompositeOverflowActivityAction, () => this.compositeOverflowActionItem.showMenu());
 			this.compositeOverflowActionItem = this.instantiationService.createInstance(
 				CompositeOverflowActivityActionItem,
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 6de483e3d23688386071e865a2dac0c2c677f6d1..949d3135c5272117932ac3d3253aee1b00e91d76 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -36,6 +36,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
 	public static activePanelSettingsKey = 'workbench.panelpart.activepanelid';
 	private static readonly PINNED_PANELS = 'workbench.panel.pinnedPanels';
+	private static readonly MIN_COMPOSITE_BAR_WIDTH = 50;
 
 	public _serviceBrand: any;
 
@@ -225,7 +226,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			let availableWidth = this.dimension.width - 8; // take padding into account
 			if (this.toolBar) {
 				// adjust height for global actions showing
-				availableWidth -= this.toolBar.getContainer().getHTMLElement().offsetWidth;
+				availableWidth = Math.max(PanelPart.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.toolBar.getContainer().getHTMLElement().offsetWidth);
 			}
 			this.compositeBar.layout(new Dimension(availableWidth, this.dimension.height));
 		}