diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp
index cdfa9bae1e..cf2bb6c770 100644
--- a/GPU/GLES/Framebuffer.cpp
+++ b/GPU/GLES/Framebuffer.cpp
@@ -1521,13 +1521,13 @@ void FramebufferManager::EndFrame() {
 		DestroyAllFBOs();
 		glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
 		int zoom = g_Config.iInternalResolution;
-		if (zoom != 0)
-		{
-			PSP_CoreParameter().renderWidth = 480 * zoom;
-			PSP_CoreParameter().renderHeight = 272 * zoom;
-			PSP_CoreParameter().outputWidth = 480 * zoom;
-			PSP_CoreParameter().outputHeight = 272 * zoom;
-		}
+		if (zoom == 0) // auto mode
+			zoom = (PSP_CoreParameter().pixelWidth + 479) / 480;
+
+		PSP_CoreParameter().renderWidth = 480 * zoom;
+		PSP_CoreParameter().renderHeight = 272 * zoom;
+		PSP_CoreParameter().outputWidth = 480 * zoom;
+		PSP_CoreParameter().outputHeight = 272 * zoom;
 		resized_ = false;
 	}
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 289eb5333a..4c0bf8805e 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -225,13 +225,12 @@ namespace MainWindow
 		// Round up to a zoom factor for the render size.
 		int zoom = g_Config.iInternalResolution;
 		if (zoom == 0) // auto mode
-		{
 			zoom = (rc.right - rc.left + 479) / 480;
-			PSP_CoreParameter().renderWidth = 480 * zoom;
-			PSP_CoreParameter().renderHeight = 272 * zoom;
-			PSP_CoreParameter().outputWidth = 480 * zoom;
-			PSP_CoreParameter().outputHeight = 272 * zoom;
-		}
+
+		PSP_CoreParameter().renderWidth = 480 * zoom;
+		PSP_CoreParameter().renderHeight = 272 * zoom;
+		PSP_CoreParameter().outputWidth = 480 * zoom;
+		PSP_CoreParameter().outputHeight = 272 * zoom;
 		
 		if (displayOSM) {
 			I18NCategory *g = GetI18NCategory("Graphics");