diff --git a/GPU/Debugger/Stepping.cpp b/GPU/Debugger/Stepping.cpp
index 99267b38f5..ea3ce03715 100644
--- a/GPU/Debugger/Stepping.cpp
+++ b/GPU/Debugger/Stepping.cpp
@@ -159,7 +159,7 @@ bool SingleStep() {
 
 bool EnterStepping() {
 	std::unique_lock<std::mutex> guard(pauseLock);
-	if (coreState != CORE_RUNNING && coreState != CORE_NEXTFRAME) {
+	if (coreState != CORE_RUNNING && coreState != CORE_NEXTFRAME && coreState != CORE_STEPPING) {
 		// Shutting down, don't try to step.
 		actionComplete = true;
 		actionWait.notify_all();