diff --git a/src/sql/parts/notebook/notebook.component.ts b/src/sql/parts/notebook/notebook.component.ts
index aeaa8bde9e..2a761e72d6 100644
--- a/src/sql/parts/notebook/notebook.component.ts
+++ b/src/sql/parts/notebook/notebook.component.ts
@@ -493,7 +493,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		let secondary: IAction[] = [];
 		let notebookBarMenu = this.menuService.createMenu(MenuId.NotebookToolbar, this.contextKeyService);
 		let groups = notebookBarMenu.getActions({ arg: null, shouldForwardArgs: true });
-		fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined);
+		fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined || group === '');
 		this.addPrimaryContributedActions(primary);
 	}
 
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 90f8bf654d..ab7bc3f63d 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -283,8 +283,9 @@ export class LabeledMenuItemActionItem extends MenuItemActionItem {
 	) {
 		super(_action, _labeledkeybindingService, _notificationService, _labeledcontextMenuService);
 	}
-	_updateLabel(): void {
-		this.element.innerText = this._commandAction.label;
+
+	updateLabel(): void {
+		this.label.innerText = this._commandAction.label;
 	}
 
 	// Overwrite item class to ensure that we can pass in a CSS class that other items use
@@ -307,14 +308,8 @@ export class LabeledMenuItemActionItem extends MenuItemActionItem {
 				MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
 			}
 
-			this.element.classList.add('icon', iconClass);
-			this.element.classList.add(this._defaultCSSClassToAdd);
-			this._labeledItemClassDispose = {
-				dispose: () => {
-					this.element.classList.remove('icon', iconClass);
-					this.element.classList.remove(this._defaultCSSClassToAdd);
-				}
-			};
+			addClasses(this.label, 'icon', iconClass, this._defaultCSSClassToAdd);
+			this._labeledItemClassDispose = toDisposable(() => removeClasses(this.label, 'icon', iconClass, this._defaultCSSClassToAdd));
 		}
 	}