diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 996ed0aa09..8ebf7f8752 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -351,6 +351,8 @@ void EmuThread()
 	DisplayMessage(cpu_info.Summarize(), 8000);
 	DisplayMessage(_CoreParameter.m_strFilename, 3000);
 
+	emuThreadGoing.Sync();
+
 	// Load GCM/DOL/ELF whatever ... we boot with the interpreter core
 	PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
 	CBoot::BootUp();
@@ -366,8 +368,6 @@ void EmuThread()
 	Host_UpdateDisasmDialog();
 	Host_UpdateMainFrame();
 
-	emuThreadGoing.Sync();
-
 	// ENTER THE VIDEO THREAD LOOP
 	if (_CoreParameter.bCPUThread)
 	{
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 2c025a7ba2..76d4685747 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -139,13 +139,12 @@ public:
 	void ToggleDisplayMode (bool bFullscreen);
 	static void ConnectWiimote(int wm_idx, bool connect);
 
-		std::recursive_mutex keystate_lock;
 	const CGameListCtrl *GetGameListCtrl() const;
 
 #ifdef __WXGTK__
 	Common::Event panic_event;
 	bool bPanicResult;
-	std::mutex keystate_lock;
+	std::recursive_mutex keystate_lock;
 #endif
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR