diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
index 5d2833efdc..15857a6fbd 100644
--- a/Source/Core/Core/HW/CPU.cpp
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -90,10 +90,12 @@ void Run()
       {
         if (PowerPC::breakpoints.IsAddressBreakPoint(PC) || PowerPC::memchecks.HasAny())
         {
+          s_state = CPU_STEPPING;
           PowerPC::CoreMode old_mode = PowerPC::GetMode();
           PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
           PowerPC::SingleStep();
           PowerPC::SetMode(old_mode);
+          s_state = CPU_RUNNING;
         }
       }