diff --git a/Core/Config.cpp b/Core/Config.cpp
index ae887f2cba..fc5019750c 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -49,6 +49,7 @@ void CConfig::Load(const char *iniFileName)
 	general->Get("FirstRun", &bFirstRun, true);
 	general->Get("AutoLoadLast", &bAutoLoadLast, false);
 	general->Get("AutoRun", &bAutoRun, true);
+	general->Get("Browse", &bBrowse, false);
 	general->Get("ConfirmOnQuit", &bConfirmOnQuit, false);
 	general->Get("IgnoreBadMemAccess", &bIgnoreBadMemAccess, true);
 	general->Get("CurrentDirectory", &currentDirectory, "");
@@ -112,6 +113,7 @@ void CConfig::Save()
 		general->Set("FirstRun", bFirstRun);
 		general->Set("AutoLoadLast", bAutoLoadLast);
 		general->Set("AutoRun", bAutoRun);
+		general->Set("Browse", bBrowse);
 		general->Set("ConfirmOnQuit", bConfirmOnQuit);
 		general->Set("IgnoreBadMemAccess", bIgnoreBadMemAccess);
 		general->Set("CurrentDirectory", currentDirectory);
diff --git a/Core/Config.h b/Core/Config.h
index de54372064..93554eeeb4 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -44,6 +44,7 @@ public:
 	bool bSpeedLimit;
 	bool bConfirmOnQuit;
 	bool bAutoRun;  // start immediately
+	bool bBrowse;
 
 	// Core
 	bool bIgnoreBadMemAccess;
diff --git a/Windows/main.cpp b/Windows/main.cpp
index f729c9abb8..b40541814f 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -159,8 +159,9 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 
 		EmuThread_Start(fileToStart);
 	}
-	// else
-	//	MainWindow::BrowseAndBoot();
+	if (g_Config.bBrowse)
+		MainWindow::BrowseAndBoot();
+
 	if (!hideLog)
 		SetForegroundWindow(hwndMain);