diff --git a/Source/Engine/Engine/Screen.cpp b/Source/Engine/Engine/Screen.cpp
index b4e35ca7a..cb2994129 100644
--- a/Source/Engine/Engine/Screen.cpp
+++ b/Source/Engine/Engine/Screen.cpp
@@ -137,20 +137,28 @@ void Screen::SetCursorLock(CursorLockMode mode)
 
 void Screen::SetGameWindowMode(GameWindowMode windowMode)
 {
-#if (PLATFORM_WINDOWS) && !USE_EDITOR
+#if !USE_EDITOR
     switch (windowMode)
     {
     case GameWindowMode::Windowed:
+        if (GetIsFullscreen())
+            SetIsFullscreen(false);
+#if (PLATFORM_WINDOWS)
         Engine::MainWindow->SetBorderless(false, false);
+#endif
         break;
     case GameWindowMode::Fullscreen:
         SetIsFullscreen(true);
         break;
     case GameWindowMode::Borderless:
+#if (PLATFORM_WINDOWS)
         Engine::MainWindow->SetBorderless(true, false);
+#endif
         break;
     case GameWindowMode::FullscreenBorderless:
+#if (PLATFORM_WINDOWS)
         Engine::MainWindow->SetBorderless(true, true);
+#endif
         break;
     default: ;
     }