diff --git a/src/main/java/com/faforever/client/headerbar/HeaderBarController.java b/src/main/java/com/faforever/client/headerbar/HeaderBarController.java
index efc4388c93..38cc6b29dc 100644
--- a/src/main/java/com/faforever/client/headerbar/HeaderBarController.java
+++ b/src/main/java/com/faforever/client/headerbar/HeaderBarController.java
@@ -34,13 +34,14 @@
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @Slf4j
 @RequiredArgsConstructor
-public class HeaderBarController implements Controller<Node> {
+public class HeaderBarController implements Controller<HBox> {
 
   private static final PseudoClass HIGHLIGHTED = PseudoClass.getPseudoClass("highlighted");
 
   private final EventBus eventBus;
   private final FxApplicationThreadExecutor fxApplicationThreadExecutor;
 
+  public MenuButton mainMenuButton;
   public HBox mainHeader;
   public ToggleButton newsButton;
   public ToggleButton chatButton;
@@ -52,6 +53,7 @@ public class HeaderBarController implements Controller<Node> {
   public ToggleButton unitsButton;
   public ToggleGroup mainNavigation;
   public Pane leftMenuPane;
+  public Pane rightMenuPane;
   /** Dropdown for when there is not enough room for all navigation buttons to be displayed. */
   public MenuButton navigationDropdown;
 
@@ -140,4 +142,8 @@ public void onNavigateButtonClicked(ActionEvent event) {
   private NavigationItem getSelectedNavigationItem() {
     return navigationItemMap.get((ToggleButton) mainNavigation.getSelectedToggle());
   }
+
+  public List<Node> getNonCaptionNodes() {
+    return List.of(leftMenuPane, navigationDropdown, rightMenuPane, mainMenuButton);
+  }
 }
diff --git a/src/main/java/com/faforever/client/main/MainController.java b/src/main/java/com/faforever/client/main/MainController.java
index 684c8916ee..54f4d0e65c 100644
--- a/src/main/java/com/faforever/client/main/MainController.java
+++ b/src/main/java/com/faforever/client/main/MainController.java
@@ -9,6 +9,7 @@
 import com.faforever.client.fx.Controller;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.JavaFxUtil;
+import com.faforever.client.headerbar.HeaderBarController;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.login.LoginController;
 import com.faforever.client.main.event.NavigateEvent;
@@ -98,11 +99,11 @@ public class MainController implements Controller<Node>, InitializingBean {
   private final ChangeListener<Path> backgroundImageListener = (observable, oldValue, newValue) ->
       setBackgroundImage(newValue);
 
-  public Pane mainHeaderPane;
   public Pane contentPane;
   public StackPane contentWrapperPane;
   public StackPane mainRoot;
   public HBox headerBar;
+  public HeaderBarController headerBarController;
 
   @VisibleForTesting
   protected Popup transientNotificationsPopup;
@@ -306,8 +307,8 @@ private void enterLoggedInState() {
       stage.setTitle(clientProperties.getMainWindowTitle());
 
       fxStage.setContent(getRoot());
-      fxStage.getNonCaptionNodes().setAll(headerBar.getChildren());
-      fxStage.setTitleBar(mainHeaderPane);
+      fxStage.getNonCaptionNodes().setAll(headerBarController.getNonCaptionNodes());
+      fxStage.setTitleBar(headerBar);
 
       openStartTab();
     });
diff --git a/src/main/resources/theme/headerbar/header_bar.fxml b/src/main/resources/theme/headerbar/header_bar.fxml
index bb2daf2fec..de750675e1 100644
--- a/src/main/resources/theme/headerbar/header_bar.fxml
+++ b/src/main/resources/theme/headerbar/header_bar.fxml
@@ -11,7 +11,7 @@
       fx:id="mainHeader" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity"
       styleClass="main-navigation-top">
     <children>
-        <fx:include source="main_menu_button.fxml"/>
+        <fx:include fx:id="mainMenuButton" source="main_menu_button.fxml"/>
         <HBox fx:id="leftMenuPane" minWidth="10.0">
             <children>
                 <fx:define>
@@ -46,7 +46,7 @@
         </HBox>
         <MenuButton fx:id="navigationDropdown" minHeight="-Infinity" minWidth="-Infinity"/>
         <Pane maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
-        <HBox alignment="TOP_RIGHT" maxHeight="-Infinity" minHeight="-Infinity"
+        <HBox fx:id="rightMenuPane" alignment="TOP_RIGHT" maxHeight="-Infinity" minHeight="-Infinity"
               minWidth="-Infinity" styleClass="right-menu">
             <children>
                 <fx:include source="notification_button.fxml"/>