--- a/DebugView.st	Mon Jan 28 11:53:01 2019 +0100
+++ b/DebugView.st	Mon Jan 28 13:39:14 2019 +0100
@@ -2396,13 +2396,6 @@
            look for pending interrupts
         "
 
-        "/
-        "/ also must care for stepping into a return
-        "/
-        steppedContext notNil ifTrue:[
-            Processor activeProcess forceInterruptOnReturnOf:steppedContext.
-        ].
-
         OpenDebuggers isNil ifTrue:[
             OpenDebuggers := WeakIdentitySet new.
         ].
@@ -2412,6 +2405,13 @@
         stepping := true.
 
         (self redefinedEnableStepInterruptForReentry:aContext) ifFalse:[
+            "/
+            "/ also must care for stepping into a return
+            "/
+            steppedContext notNil ifTrue:[
+                Processor activeProcess forceInterruptOnReturnOf:steppedContext.
+            ].
+
             ObjectMemory stepInterruptHandler:self.
             Processor activeProcess stepInterruptHandler:self.
             ObjectMemory flushCaches.
@@ -2479,7 +2479,7 @@
     "Modified: / 13-10-1998 / 19:56:59 / ps"
     "Modified: / 27-07-2012 / 17:35:56 / cg"
     "Modified: / 01-02-2018 / 10:08:28 / stefan"
-    "Modified: / 28-01-2019 / 11:50:39 / Claus Gittinger"
+    "Modified: / 28-01-2019 / 13:22:57 / Claus Gittinger"
 !
 
 exit_abort