diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 5f37b263..e437aec8 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -3260,9 +3260,11 @@ begin
   break2step := isGutterIconSet(line, giBreakReached);
   removeGutterIcon(line, giBreakSet);
   if assigned(fDebugger) then
+  begin
     fDebugger.removeBreakPoint(fFilename, line);
-  if break2step then
-    addGutterIcon(line, giStep);
+    if break2step and fDebugger.running then
+      addGutterIcon(line, giStep);
+  end;
 end;
 
 procedure TCESynMemo.showHintEvent(Sender: TObject; HintInfo: PHintInfo);