diff --git a/Lib/bdb.py b/Lib/bdb.py
index 75d6113576372e..78592600e1b0f6 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -201,8 +201,10 @@ def is_skipped_module(self, module_name):
 
     def stop_here(self, frame):
         "Return True if frame is below the starting frame in the stack."
-        # (CT) stopframe may now also be None, see dispatch_call.
-        # (CT) the former test for None is therefore removed from here.
+        if (self.stopframe is None
+                and self.returnframe is None
+                and self.stoplineno == 0):  # TEST: via set_step
+            return True
         if self.skip and \
                self.is_skipped_module(frame.f_globals.get('__name__')):
             return False