diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index 3a99892aad..37c993a7d7 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -87,17 +87,22 @@ void Pcsx2App::OpenMainFrame()
 
 	MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() );
 	m_id_MainFrame = mainFrame->GetId();
-
+	
+#ifndef PCSX2_DEVBUILD
 	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
+#endif
 	{
 		DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
 		m_id_Disassembler = disassembly->GetId();
 
 		if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart)
 			disassembly->Show();
-	} else {
+	}
+#ifndef PCSX2_DEVBUILD
+	else {
 		m_id_Disassembler = 0;
 	}
+#endif
 
 	PostIdleAppMethod( &Pcsx2App::OpenProgramLog );
 
diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp
index 02d4786224..ead0b3a8bd 100644
--- a/pcsx2/gui/MainFrame.cpp
+++ b/pcsx2/gui/MainFrame.cpp
@@ -340,8 +340,12 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
 	m_menubar.Append( &m_menuConfig,	_("&Config") );
 	m_menubar.Append( &m_menuMisc,		_("&Misc") );
 	
+#ifndef PCSX2_DEVBUILD
 	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
+#endif
+	{
 		m_menubar.Append( &m_menuDebug,		_("&Debug") );
+	}
 
 	SetMenuBar( &m_menubar );
 
@@ -508,7 +512,9 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
 	m_menuMisc.AppendSeparator();
 	m_menuMisc.Append( MenuId_ChangeLang,		L"Change Language" ); // Always in English
 
+#ifndef PCSX2_DEVBUILD
 	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
+#endif
 	{
 		m_menuDebug.Append(MenuId_Debug_Open,		_("Open Debug Window..."),	wxEmptyString);
 		//m_menuDebug.Append(MenuId_Debug_MemoryDump,	_("Memory Dump..."),		wxEmptyString);