diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 42b8aa7e6d..228e488d13 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -372,6 +372,7 @@ THREAD_RETURN EmuThread(void *pArg)
 	}
 
 	// Wait for CPU thread to exit - it should have been signaled to do so by now
+	cpuThread->WaitForDeath();
 	if( g_pUpdateFPSDisplay != NULL )
         g_pUpdateFPSDisplay("Stopping...");
 	delete cpuThread;