diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 75a9de022e..60d9075b6e 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1568,12 +1568,16 @@ void CFrame::HandleFrameSkipHotkeys()
 			wxCommandEvent evt;
 			evt.SetId(IDM_FRAMESTEP);
 			CFrame::OnFrameStep(evt);
-			if (holdFrameStepDelay > 0 && frameStepCount == 0)
+			if (holdFrameStepDelay > 0)
 				holdFrameStep = true;
 		}
 
 		if (frameStepCount < FRAME_STEP_DELAY)
+		{
 			++frameStepCount;
+			if (holdFrameStep)
+				holdFrameStep = false;
+		}
 
 		if (frameStepCount == FRAME_STEP_DELAY && holdFrameStep && holdFrameStepDelayCount >= holdFrameStepDelay)
 		{