diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 5bc4f10c23..4ee10ca9ee 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Common"
 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
 	RootNamespace="Common"
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index 393fa99f9c..e912e1afff 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -101,6 +101,9 @@ BEGIN_EVENT_TABLE(CCodeWindow, wxPanel)
 	// Menu bar
 	EVT_MENU(IDM_INTERPRETER,       CCodeWindow::OnCPUMode) // CPU Mode
 	EVT_MENU(IDM_AUTOMATICSTART,       CCodeWindow::OnCPUMode)
+	EVT_MENU(IDM_BOOTTOPAUSE,       CCodeWindow::OnCPUMode)
+
+	EVT_MENU(IDM_JITUNLIMITED,	 CCodeWindow::OnCPUMode)
 	EVT_MENU(IDM_JITOFF,			CCodeWindow::OnCPUMode)
 	EVT_MENU(IDM_JITLSOFF,			CCodeWindow::OnCPUMode)
 		EVT_MENU(IDM_JITLSLXZOFF,		CCodeWindow::OnCPUMode)
@@ -711,7 +714,6 @@ void CCodeWindow::OnCodeStep(wxCommandEvent& event)
 	    case IDM_DEBUG_GO:
 	    {
 		    // [F|RES] prolly we should disable the other buttons in go mode too ...
-
 		    if (CCPU::IsStepping())
 		    {
 			    CCPU::EnableStepping(false);
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h
index e5e0b80321..240b5798bc 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.h
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.h
@@ -80,18 +80,7 @@ class CCodeWindow
 	private:
 
 		enum
-		{
-			// Toolbar
-			ID_TOOLBAR = 2000,
-			IDM_DEBUG_GO,
-			IDM_STEP,
-			IDM_STEPOVER,
-			IDM_SKIP,
-			IDM_SETPC,
-			IDM_GOTOPC,
-			IDM_ADDRBOX,
-			
-			// ==============================================================
+		{			
 			// Debugger GUI Objects
 			ID_CODEVIEW,
 			ID_CALLSTACKLIST,
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index b3d4554b78..214c2d3e4b 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -548,9 +548,15 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 
 // Post events
 void CFrame::PostEvent(wxCommandEvent& event)
-{
-	// Don't post zero events, that may hang
-	if (g_pCodeWindow && event.GetId()) wxPostEvent(g_pCodeWindow, event);
+{	
+	// Restrict the post events to the minimum necessary, it seems like these events are
+	// somtimes posted to the parent wxFrame too so that it creates and endless loop
+	if (g_pCodeWindow
+		&& event.GetId() >= IDM_INTERPRETER && event.GetId() <= IDM_ADDRBOX
+		&& event.GetId() != IDM_JITUNLIMITED
+		)
+		wxPostEvent(g_pCodeWindow, event);
+	event.Skip();
 }
 void CFrame::PostMenuEvent(wxMenuEvent& event)
 {
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 75241ee3df..7da2ab8771 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -153,7 +153,7 @@ enum
 	// --------------------------------------------------------------
 	// Debugger Toolbar
 	// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
-	ID_TOOLBAR2 = 2000,
+	ID_TOOLBAR2,
 	IDM_DEBUG_GO,
 	IDM_STEP,
 	IDM_STEPOVER,