diff --git a/src/core.c b/src/core.c
index d4df605f4..2e9bfb635 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2507,9 +2507,6 @@ static bool InitGraphicsDevice(int width, int height)
     if (screenHeight <= 0) screenHeight = displayHeight;
 #endif  // PLATFORM_DESKTOP
 
-    currentWidth = screenWidth;
-    currentHeight = screenHeight;
-
 #if defined(PLATFORM_WEB)
     displayWidth = screenWidth;
     displayHeight = screenHeight;
@@ -3040,6 +3037,9 @@ static bool InitGraphicsDevice(int width, int height)
     // Setup default viewport
     SetupViewport(fbWidth, fbHeight);
 
+    currentWidth = screenWidth;
+    currentHeight = screenHeight;
+
     ClearBackground(RAYWHITE);      // Default background color for raylib games :P
 
 #if defined(PLATFORM_ANDROID)