diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index b09a64d5dd..8a0b6c6441 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -569,9 +569,10 @@ int main(int argc, char *argv[]) {
 
 	Uint32 mode = 0;
 	for (int i = 1; i < argc; i++) {
-		if (!strcmp(argv[i],"--fullscreen"))
+		if (!strcmp(argv[i],"--fullscreen")) {
 			mode |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-		else if (set_xres == -2)
+			g_Config.iForceFullScreen = 1;
+		} else if (set_xres == -2)
 			set_xres = parseInt(argv[i]);
 		else if (set_yres == -2)
 			set_yres = parseInt(argv[i]);
@@ -657,7 +658,8 @@ int main(int argc, char *argv[]) {
 	if (mode & SDL_WINDOW_FULLSCREEN_DESKTOP) {
 		pixel_xres = g_DesktopWidth;
 		pixel_yres = g_DesktopHeight;
-		g_Config.iForceFullScreen = 1;
+		if (g_Config.iForceFullScreen == -1)
+			g_Config.bFullScreen = true;
 	} else {
 		// set a sensible default resolution (2x)
 		pixel_xres = 480 * 2 * set_scale;
@@ -665,7 +667,8 @@ int main(int argc, char *argv[]) {
 		if (portrait) {
 			std::swap(pixel_xres, pixel_yres);
 		}
-		g_Config.iForceFullScreen = 0;
+		if (g_Config.iForceFullScreen == -1)
+			g_Config.bFullScreen = false;
 	}
 
 	set_dpi = 1.0f / set_dpi;