diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala
index 96efbb026..86125b023 100644
--- a/main/src/main/scala/sbt/internal/Continuous.scala
+++ b/main/src/main/scala/sbt/internal/Continuous.scala
@@ -1256,7 +1256,7 @@ private[sbt] object ContinuousCommands {
     watchState(channel).beforeCommand(state)
   }
   private[this] val postWatchCommand = watchCommand(postWatch) { (channel, state) =>
-    StandardMain.exchange.channelForName(channel).foreach(_.terminal.setPrompt(Prompt.Watch))
+    StandardMain.exchange.unprompt(ConsoleUnpromptEvent(Some(CommandSource(channel))), false)
     val ws = watchState(channel)
     watchStates.put(channel, ws.withPending(false))
     ws.afterCommand(state)
@@ -1266,7 +1266,7 @@ private[sbt] object ContinuousCommands {
     state
   }
   private[sbt] def stopWatchImpl(channelName: String): Unit = {
-    StandardMain.exchange.channelForName(channelName).foreach(_.terminal.setPrompt(Prompt.Running))
+    StandardMain.exchange.unprompt(ConsoleUnpromptEvent(Some(CommandSource(channelName))), false)
     Option(watchStates.get(channelName)).foreach { ws =>
       ws.afterWatch()
       ws.callbacks.onExit()