diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index e5e136810..eb504e5f4 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -618,6 +618,8 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
         finished = nextStates.empty();
       } while(!finished);
 
+      r->SetFrameEvent(m_Ctx.CurEvent(), true);
+
       m_States = states;
 
       for(const ShaderVariableChange &c : GetCurrentState().changes)
diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp
index 308d50b48..79df1ae3d 100644
--- a/renderdoc/replay/replay_controller.cpp
+++ b/renderdoc/replay/replay_controller.cpp
@@ -1661,8 +1661,6 @@ rdcarray<ShaderDebugState> ReplayController::ContinueDebug(ShaderDebugger *debug
 
   rdcarray<ShaderDebugState> ret = m_pDevice->ContinueDebug(debugger);
 
-  SetFrameEvent(m_EventID, true);
-
   return ret;
 }