diff --git a/Core/Config.cpp b/Core/Config.cpp
index 54a4feca13..8384b4b0ec 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -157,7 +157,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
 	graphics->Get("VertexCache", &bVertexCache, true);
 #ifdef _WIN32
 	graphics->Get("FullScreen", &bFullScreen, false);
-	graphics->Get("FullScreenOnLaunch", &bFullScreenOnLaunch, false);
 #endif
 #ifdef BLACKBERRY
 	graphics->Get("PartialStretch", &bPartialStretch, pixel_xres == pixel_yres);
@@ -316,7 +315,6 @@ void Config::Save() {
 		graphics->Set("VertexCache", bVertexCache);
 #ifdef _WIN32
 		graphics->Set("FullScreen", bFullScreen);
-		graphics->Set("FullScreenOnLaunch", bFullScreenOnLaunch);
 #endif		
 #ifdef BLACKBERRY
 		graphics->Set("PartialStretch", bPartialStretch);
diff --git a/Core/Config.h b/Core/Config.h
index 2fbb4e2f40..2a9a3a736f 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -78,9 +78,6 @@ public:
 
 	bool bVertexCache;
 	bool bFullScreen;
-#ifdef _WIN32
-	bool bFullScreenOnLaunch;
-#endif
 	int iInternalResolution;  // 0 = Auto (native), 1 = 1x (480x272), 2 = 2x, 3 = 3x, 4 = 4x and so on.
 	int iAnisotropyLevel;  // 0 - 5, powers of 2: 0 = 1x = no aniso
 	bool bTrueColor;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 972aab5d97..5768cb7d25 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -706,9 +706,7 @@ namespace MainWindow
 		hideCursor = true;
 		SetTimer(hwndMain, TIMER_CURSORUPDATE, CURSORUPDATE_INTERVAL_MS, 0);
 		
-		// Update();
-
-		if(g_Config.bFullScreenOnLaunch)
+		if(g_Config.bFullScreen)
 			_ViewFullScreen(hwndMain);
 		
 		ShowWindow(hwndMain, nCmdShow);
diff --git a/Windows/main.cpp b/Windows/main.cpp
index c293160092..0be70b8799 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -83,13 +83,16 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 	}
 	SetCurrentDirectory(modulePath);
 	// GetCurrentDirectory(MAX_PATH, modulePath);  // for checking in the debugger
-
+#ifndef _DEBUG
 	bool hideLog = true;
-
-#ifdef _DEBUG
-	hideLog = false;
+#else
+	bool hideLog = false;
 #endif
 
+	// Load config up here, because those changes below would be overwritten
+	// if it's not loaded here first.
+	g_Config.Load();
+
 	// The rest is handled in NativeInit().
 	for (int i = 1; i < __argc; ++i)
 	{
@@ -107,7 +110,15 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 				g_Config.bAutoRun = false;
 				g_Config.bSaveSettings = false;
 				break;
+			case '-':
+			    break;
 			}
+
+			if (!strncmp(__argv[i], "--fullscreen", strlen("--fullscreen")))
+				g_Config.bFullScreen = true;
+
+			if (!strncmp(__argv[i], "--windowed", strlen("--windowed")))
+				g_Config.bFullScreen = false;
 		}
 	}
 
@@ -128,8 +139,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 		langRegion = "en_US";
 	}
 
-	g_Config.Load();
-
 	LogManager::Init();
 	LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console");