diff --git a/src/main/java/com/faforever/client/headerbar/MainMenuButtonController.java b/src/main/java/com/faforever/client/headerbar/MainMenuButtonController.java
index 453f9ba58d..35d00a3fcb 100644
--- a/src/main/java/com/faforever/client/headerbar/MainMenuButtonController.java
+++ b/src/main/java/com/faforever/client/headerbar/MainMenuButtonController.java
@@ -12,6 +12,7 @@
 import com.faforever.client.theme.UiService;
 import com.faforever.client.ui.StageHolder;
 import javafx.scene.control.MenuButton;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import lombok.RequiredArgsConstructor;
@@ -73,12 +74,13 @@ public void onSettingsSelected() {
     SettingsController settingsController = uiService.loadFxml("theme/settings/settings.fxml");
     FxStage fxStage = FxStage.create(settingsController.getRoot())
         .initOwner(menuButton.getScene().getWindow())
-                             .withSceneFactory(themeService::createScene)
+        .withSceneFactory(themeService::createScene)
         .allowMinimize(false)
         .apply()
         .setTitleBar(settingsController.settingsHeader);
 
     Stage stage = fxStage.getStage();
+    stage.initModality(Modality.WINDOW_MODAL);
 
     stage.setTitle(i18n.get("settings.windowTitle"));
     stage.show();