diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index a098561134b..1f376f232f0 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -523,30 +523,6 @@ export class ViewletOverflowActivityActionItem extends ActivityActionItem {
 		this.name = action.label;
 	}
 
-	protected updateStyles(): void {
-		const theme = this.themeService.getTheme();
-
-		// Label
-		if (this.$label) {
-			const background = theme.getColor(ACTIVITY_BAR_FOREGROUND);
-
-			this.$label.style('background-color', background ? background.toString() : null);
-		}
-	}
-
-	public render(container: HTMLElement): void {
-		super.render(container);
-
-		this.$label = $('a.action-label').attr({
-			tabIndex: '0',
-			role: 'button',
-			title: this.name,
-			class: this.cssClass
-		}).appendTo(this.builder);
-
-		this.updateStyles();
-	}
-
 	public showMenu(): void {
 		if (this.actions) {
 			dispose(this.actions);
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 4265d0730ae..0376269e6b2 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -293,8 +293,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 	private updateViewletSwitcher() {
 		if (!this.viewletSwitcherBar) {
-			// We have not been rendered yet so there is nothing to update.
-			return;
+			return; // We have not been rendered yet so there is nothing to update.
 		}
 
 		let viewletsToShow = this.getPinnedViewlets();
@@ -311,7 +310,12 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		// Ensure we are not showing more viewlets than we have height for
 		let overflows = false;
 		if (this.dimension) {
-			const maxVisible = Math.floor(this.dimension.height / ActivitybarPart.ACTIVITY_ACTION_HEIGHT);
+			let availableHeight = this.dimension.height;
+			if (this.globalActionBar) {
+				availableHeight -= (this.globalActionBar.items.length * ActivitybarPart.ACTIVITY_ACTION_HEIGHT); // adjust for global actions showing
+			}
+
+			const maxVisible = Math.floor(availableHeight / ActivitybarPart.ACTIVITY_ACTION_HEIGHT);
 			overflows = viewletsToShow.length > maxVisible;
 
 			if (overflows) {