diff --git a/Core/Config.cpp b/Core/Config.cpp
index 6b8cbfce39..6d79df1bad 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -69,6 +69,7 @@ void CConfig::Load(const char *iniFileName)
 	graphics->Get("VBO", &bUseVBO, false);
 	graphics->Get("DisableG3DLog", &bDisableG3DLog, false);
 	graphics->Get("VertexCache", &bVertexCache, true);
+	graphics->Get("FullScreen", &bFullScreen, false);	
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
@@ -122,6 +123,7 @@ void CConfig::Save()
 		graphics->Set("VBO", bUseVBO);
 		graphics->Set("DisableG3DLog", bDisableG3DLog);
 		graphics->Set("VertexCache", bVertexCache);
+		graphics->Set("FullScreen", bFullScreen);
 
 		IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 		sound->Set("Enable", bEnableSound);
diff --git a/Core/Config.h b/Core/Config.h
index 7103f0073f..669331404d 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -58,6 +58,7 @@ public:
 	bool SSAntiAliasing; //for Windows, too
 	bool bDisableG3DLog;
 	bool bVertexCache;
+	bool bFullScreen;
 
 	// Sound
 	bool bEnableSound;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 36866ce5c2..35ad1dd03d 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -498,8 +498,7 @@ namespace MainWindow
 			case ID_OPTIONS_FULLSCREEN:
 				if(g_bFullScreen) {
 					_ViewNormal(hWnd); 
-				}
-				else {
+				} else {
 					_ViewFullScreen(hWnd);
 				}
 				UpdateMenus();
@@ -644,6 +643,7 @@ namespace MainWindow
 			disasmWindow[0] = new CDisasm(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
 			DialogManager::AddDlg(disasmWindow[0]);
 			disasmWindow[0]->Show(g_Config.bShowDebuggerOnLoad);
+			if (g_Config.bFullScreen)  _ViewFullScreen(hWnd);
 			memoryWindow[0] = new CMemoryDlg(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
 			DialogManager::AddDlg(memoryWindow[0]);
 			if (disasmWindow[0])