diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index ad88fb459..80cf3e556 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -6025,9 +6025,9 @@ SUB DebugMode
         IF LEFT$(program$, 2) = "./" THEN program$ = MID$(program$, 3)
 
         IF program$ <> lastBinaryGenerated$ THEN
+            clearStatusWindow
             COLOR 7, 1
             _PRINTSTRING (2, idewy - 3), "Failed to initiate debug session."
-            clearStatusWindow
             dummy = DarkenFGBG(0)
             PCOPY 3, 0
             EXIT SUB
@@ -6062,10 +6062,6 @@ SUB DebugMode
                 l = CVL(RIGHT$(a$, 4))
             END IF
 
-            idecy = l
-            ideshowtext
-            PCOPY 3, 0
-
             k& = _KEYHIT
             IF k& = 16896 THEN 'F8
                 PauseMode = -1
@@ -6074,7 +6070,11 @@ SUB DebugMode
             IF IdeBreakpoints(l) = 0 AND PauseMode = 0 THEN
                 a$ = "run" + endc$
                 PUT #client&, , a$
+                dummy = DarkenFGBG(1)
             ELSE
+                idecy = l
+                ideshowtext
+                PCOPY 3, 0
                 DO
                     k& = _KEYHIT
                     IF k& = 27 THEN
diff --git a/source/utilities/vwatch.bm b/source/utilities/vwatch.bm
index 4fa56d502..7c689a3df 100644
--- a/source/utilities/vwatch.bm
+++ b/source/utilities/vwatch.bm
@@ -1,6 +1,8 @@
 $CHECKING:OFF
+
 SUB vwatch (linenumber AS LONG)
     STATIC AS LONG ide, bypass
+    DIM endc$, start!, me$, temp$, buffer$, k&
 
     IF bypass THEN EXIT SUB
 
@@ -19,9 +21,11 @@ SUB vwatch (linenumber AS LONG)
 
         'start! = TIMER
         DO
+            k& = _KEYHIT
             GET #ide, , temp$
             buffer$ = buffer$ + temp$
-        LOOP UNTIL INSTR(buffer$, endc$) > 0 'OR TIMER - start! > 2
+            _LIMIT 100
+        LOOP UNTIL k& = 27 OR INSTR(buffer$, endc$) > 0 'OR TIMER - start! > 2
 
         buffer$ = LEFT$(buffer$, INSTR(buffer$, endc$) - 1)
         IF buffer$ <> "vwatch:ok" THEN
@@ -38,7 +42,9 @@ SUB vwatch (linenumber AS LONG)
         DO
             GET #ide, , temp$
             buffer$ = buffer$ + temp$
-        LOOP UNTIL INSTR(buffer$, endc$) > 0
+            k& = _KEYHIT
+            _LIMIT 100
+        LOOP UNTIL k& = 27 OR INSTR(buffer$, endc$) > 0
 
         buffer$ = LEFT$(buffer$, INSTR(buffer$, endc$) - 1)
         IF buffer$ = "run" THEN