diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..2fd6331c86 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,6 +126,8 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
+        private Bindable<WindowMode> windowMode;
+
         private readonly string[] args;
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
@@ -631,6 +633,12 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+            {
+                    windowMode.Value = WindowMode.Windowed;
+            }), true);
+
             var onScreenDisplay = new OnScreenDisplay();
 
             onScreenDisplay.BeginTracking(this, frameworkConfig);