diff --git a/src/drivers/Qt/ConsoleDebugger.cpp b/src/drivers/Qt/ConsoleDebugger.cpp
index ee4cca05..81204d9a 100644
--- a/src/drivers/Qt/ConsoleDebugger.cpp
+++ b/src/drivers/Qt/ConsoleDebugger.cpp
@@ -457,7 +457,7 @@ ConsoleDebugger::ConsoleDebugger(QWidget *parent)
    connect( debFileChkBox , SIGNAL(stateChanged(int)), this, SLOT(debFileAutoLoadCB(int)) );
 
 	button->setEnabled(false); // TODO
-	autoOpenChkBox->setEnabled(false); // TODO
+	//autoOpenChkBox->setEnabled(false); // TODO
 	//debFileChkBox->setEnabled(false); // TODO
 	idaFontChkBox->setEnabled(false); // TODO
 
@@ -2176,6 +2176,11 @@ void FCEUD_DebugBreakpoint( int bpNum )
 	fceuWrapperLock();
 }
 //----------------------------------------------------------------------------
+bool debuggerWindowIsOpen(void)
+{
+	return (dbgWinList.size() > 0);
+}
+//----------------------------------------------------------------------------
 static int getGameDebugBreakpointFileName(char *filepath)
 {
 	int i,j;
diff --git a/src/drivers/Qt/ConsoleDebugger.h b/src/drivers/Qt/ConsoleDebugger.h
index 3661e5ac..b3f05f7c 100644
--- a/src/drivers/Qt/ConsoleDebugger.h
+++ b/src/drivers/Qt/ConsoleDebugger.h
@@ -231,6 +231,7 @@ class ConsoleDebugger : public QDialog
 
 };
 
+bool debuggerWindowIsOpen(void);
 void saveGameDebugBreakpoints(void);
 void loadGameDebugBreakpoints(void);
 void debuggerClearAllBreakpoints(void);
diff --git a/src/drivers/Qt/ConsoleWindow.h b/src/drivers/Qt/ConsoleWindow.h
index 375aea1f..e2f16e33 100644
--- a/src/drivers/Qt/ConsoleWindow.h
+++ b/src/drivers/Qt/ConsoleWindow.h
@@ -113,6 +113,9 @@ class  consoleWin_t : public QMainWindow
 	private:
 		void createMainMenu(void);
 
+	public slots:
+		void openDebugWindow(void);
+		void openHexEditor(void);
 	private slots:
 		void closeApp(void);
 		void openROMFile(void);
@@ -156,8 +159,6 @@ class  consoleWin_t : public QMainWindow
 		void fdsEjectDisk(void);
 		void fdsLoadBiosFile(void);
 		void openCheats(void);
-		void openDebugWindow(void);
-		void openHexEditor(void);
 		void openMovie(void);
 		void stopMovie(void);
 		void recordMovie(void);
diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp
index 5ff1d5ac..f618991f 100644
--- a/src/drivers/Qt/fceuWrapper.cpp
+++ b/src/drivers/Qt/fceuWrapper.cpp
@@ -229,13 +229,6 @@ int LoadGame(const char *path)
 		return 0;
 	}
 
-	g_config->getOption( "SDL.AutoOpenDebugger", &autoOpenDebugger );
-
-	if ( autoOpenDebugger )
-	{
-		// TODO Auto Open Debugger
-	}
-
 	hexEditorLoadBookmarks();
 
 	g_config->getOption( "SDL.AutoLoadDebugFiles", &autoLoadDebug );
@@ -245,6 +238,13 @@ int LoadGame(const char *path)
 		loadGameDebugBreakpoints();
 	}
 
+	g_config->getOption( "SDL.AutoOpenDebugger", &autoOpenDebugger );
+
+	if ( autoOpenDebugger && !debuggerWindowIsOpen() )
+	{
+		consoleWindow->openDebugWindow();
+	}
+
 	debugSymbolTable.loadGameSymbols();
 
     int state_to_load;