diff --git a/Barotrauma/BarotraumaClient/Source/GameMain.cs b/Barotrauma/BarotraumaClient/Source/GameMain.cs
index 793cde17c..fe28df09d 100644
--- a/Barotrauma/BarotraumaClient/Source/GameMain.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameMain.cs
@@ -226,11 +226,6 @@ namespace Barotrauma
 
             GraphicsWidth = Config.GraphicsWidth;
             GraphicsHeight = Config.GraphicsHeight;
-            if (Config.WindowMode == WindowMode.BorderlessWindowed)
-            {
-                GraphicsWidth = GraphicsDevice.DisplayMode.Width;
-                GraphicsHeight = GraphicsDevice.DisplayMode.Height;
-            }
 
             GraphicsDeviceManager.GraphicsProfile = GraphicsProfile.Reach;
             GraphicsDeviceManager.PreferredBackBufferFormat = SurfaceFormat.Color;
@@ -272,6 +267,9 @@ namespace Barotrauma
         {
             base.Initialize();
 
+            DisplayWidth = GraphicsDevice.DisplayMode.Width;
+            DisplayHeight = GraphicsDevice.DisplayMode.Height;
+
             RequestGraphicsSettings();
 
             ScissorTestEnable = new RasterizerState() { ScissorTestEnable = true };
@@ -333,6 +331,7 @@ namespace Barotrauma
             ApplyGraphicsSettings();
             yield return CoroutineStatus.Success;
         }
+#endif
 
         private void HandleDefocus(object sender, EventArgs e)
         {
@@ -349,9 +348,6 @@ namespace Barotrauma
         }
 #endif
 
-            loadingCoroutine = CoroutineManager.StartCoroutine(Load(canLoadInSeparateThread), "", canLoadInSeparateThread);
-        }
-        
         private void InitUserStats()
         {
             if (GameSettings.ShowUserStatisticsPrompt)
diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 671a67481..2ac1eddb1 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -199,7 +199,7 @@ namespace Barotrauma
 
                 // In a bundled .app you just disable HiDPI in the info.plist
                 // but that's probably not gonna happen.
-                if (mode.Width > GameMain.Instance.GraphicsDevice.DisplayMode.Width || mode.Height > GameMain.Instance.GraphicsDevice.DisplayMode.Height) { continue; }
+                if (mode.Width > GameMain.DisplayWidth || mode.Height > GameMain.DisplayHeight) { continue; }
 #endif
                 supportedDisplayModes.Add(mode);
             }
@@ -257,6 +257,15 @@ namespace Barotrauma
             {
                 displayModeDD.SelectItem(GameMain.Config.WindowMode);
             }
+#endif
+            displayModeDD.OnSelected = (guiComponent, obj) =>
+            {
+                displayModeDD.SelectItem(WindowMode.Fullscreen);
+            }
+            else
+            {
+                displayModeDD.SelectItem(GameMain.Config.WindowMode);
+            }
 #endif
             displayModeDD.OnSelected = (guiComponent, obj) =>
             {
@@ -266,8 +275,8 @@ namespace Barotrauma
                 if (GameMain.Config.WindowMode == WindowMode.BorderlessWindowed)
                 {
                     resolutionDD.SelectItem(GraphicsAdapter.DefaultAdapter.SupportedDisplayModes.First(
-                            m => m.Width == GameMain.Instance.GraphicsDevice.DisplayMode.Width &&
-                                 m.Height == GameMain.Instance.GraphicsDevice.DisplayMode.Height));
+                            m => m.Width == GameMain.DisplayWidth &&
+                                 m.Height == GameMain.DisplayHeight));
                     resolutionDD.ButtonEnabled = false;
                 }
                 else