diff --git a/components/fpdebug/fpdbgwinclasses.pas b/components/fpdebug/fpdbgwinclasses.pas
index f51f2dd9ac..db0b16a0c2 100644
--- a/components/fpdebug/fpdbgwinclasses.pas
+++ b/components/fpdebug/fpdbgwinclasses.pas
@@ -1017,6 +1017,7 @@ begin
   Context^.ContextFlags := CONTEXT_CONTROL;
   {$ifdef cpui386}
   Dec(Context^.Eip);
+  dec(GCurrentContext^.Eip);
   {$else}
   Dec(Context^.Rip);
   {$endif}