diff --git a/cpuexec.cpp b/cpuexec.cpp
index cd2b1ba1c..044710ccc 100644
--- a/cpuexec.cpp
+++ b/cpuexec.cpp
@@ -298,6 +298,7 @@ void S9xDoHEventProcessing (void)
 
 				ICPU.Frame++;
 				PPU.HVBeamCounterLatched = 0;
+				CPU.Flags |= SCAN_KEYS_FLAG;
 			}
 
 			// From byuu:
@@ -327,9 +328,6 @@ void S9xDoHEventProcessing (void)
 			if (CPU.V_Counter == PPU.ScreenHeight + FIRST_VISIBLE_LINE)	// VBlank starts from V=225(240).
 			{
 				S9xEndScreenRefresh();
-
-				CPU.Flags |= SCAN_KEYS_FLAG;
-
 				PPU.HDMA = 0;
 				// Bits 7 and 6 of $4212 are computed when read in S9xGetPPU.
 			#ifdef DEBUGGER