diff --git a/Core/debugger.c b/Core/debugger.c
index 8b6d6cf4..e7f6881f 100644
--- a/Core/debugger.c
+++ b/Core/debugger.c
@@ -2059,7 +2059,7 @@ void GB_debugger_run(GB_gameboy_t *gb)
     if (gb->debug_disable) return;
 
     char *input = NULL;
-    if (gb->debug_next_command && gb->debug_call_depth <= 0) {
+    if (gb->debug_next_command && gb->debug_call_depth <= 0 && !gb->halted) {
         gb->debug_stopped = true;
     }
     if (gb->debug_fin_command && gb->debug_call_depth == -1) {