diff --git a/vvp/schedule.cc b/vvp/schedule.cc
index a844727ed..955bae80e 100644
--- a/vvp/schedule.cc
+++ b/vvp/schedule.cc
@@ -623,6 +623,8 @@ void schedule_simulate(void)
 	    if (schedule_stopped_flag) {
 		  schedule_stopped_flag = false;
 		  stop_handler(0);
+		  // You can finish from the debugger without a time change.
+		  if (!schedule_runnable) break;
 		  continue;
 	    }