diff --git a/src/main.rs b/src/main.rs
index 7cd5c80b..652d1468 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -111,6 +111,7 @@ fn main() -> Result<ExitCode> {
             };
 
             watch::watch(&mut app_state, notify_exercise_names)?;
+            app_state.close_editor()?;
         }
         Some(Command::Run { name }) => {
             if let Some(name) = name {
diff --git a/src/watch.rs b/src/watch.rs
index ab96893e..857ccfde 100644
--- a/src/watch.rs
+++ b/src/watch.rs
@@ -172,8 +172,7 @@ pub fn watch(
     watch_list_loop(app_state, notify_exercise_names)
 }
 
-const QUIT_MSG: &[u8] = b"
-
+const QUIT_MSG: &[u8] = b"q\n
 We hope you're enjoying learning Rust!
 If you want to continue working on the exercises at a later point, you can simply run `rustlings` again in this directory.
 ";