diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 8ebf7f8752..8e092231fb 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -351,10 +351,11 @@ 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);
+
+	emuThreadGoing.Sync();
+
 	CBoot::BootUp();
 
 	// Setup our core, but can't use dynarec if we are compare server
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index e0afea9ac7..31a696db62 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -219,7 +219,7 @@ void X11_MainLoop()
 							State_Load(slot_number);
 					}
 					else if (key == XK_F9)
-						Core::ScreenShot();
+						Core::SaveScreenShot();
 					else if (key == XK_F11)
 						State_LoadLastSaved();
 					else if (key == XK_F12)