diff --git a/src/watch.rs b/src/watch.rs
index 7b4a02d..8b21103 100644
--- a/src/watch.rs
+++ b/src/watch.rs
@@ -27,13 +27,12 @@ pub enum WatchExit {
     List,
 }
 
-#[derive(Copy, Clone)]
 enum InputEvent {
     Hint,
     Clear,
     List,
     Quit,
-    Unrecognized,
+    Unrecognized(String),
 }
 
 enum WatchEvent {
@@ -85,7 +84,7 @@ impl notify_debouncer_mini::DebounceEventHandler for DebouceEventHandler {
 fn terminal_event_handler(tx: Sender<WatchEvent>) {
     let mut input = String::with_capacity(8);
 
-    loop {
+    let last_input_event = loop {
         let terminal_event = match event::read() {
             Ok(v) => v,
             Err(e) => {
@@ -108,20 +107,15 @@ fn terminal_event_handler(tx: Sender<WatchEvent>) {
                         let input_event = match input.trim() {
                             "h" | "hint" => InputEvent::Hint,
                             "c" | "clear" => InputEvent::Clear,
-                            "l" | "list" => InputEvent::List,
-                            "q" | "quit" => InputEvent::Quit,
-                            _ => InputEvent::Unrecognized,
+                            "l" | "list" => break InputEvent::List,
+                            "q" | "quit" => break InputEvent::Quit,
+                            _ => InputEvent::Unrecognized(input.clone()),
                         };
 
                         if tx.send(WatchEvent::Input(input_event)).is_err() {
                             return;
                         }
 
-                        match input_event {
-                            InputEvent::List | InputEvent::Quit => return,
-                            _ => (),
-                        }
-
                         input.clear();
                     }
                     KeyCode::Char(c) => {
@@ -137,7 +131,9 @@ fn terminal_event_handler(tx: Sender<WatchEvent>) {
             }
             Event::FocusGained | Event::FocusLost | Event::Mouse(_) | Event::Paste(_) => continue,
         }
-    }
+    };
+
+    let _ = tx.send(WatchEvent::Input(last_input_event));
 }
 
 pub fn watch(state_file: &mut StateFile, exercises: &'static [Exercise]) -> Result<WatchExit> {
@@ -173,8 +169,8 @@ pub fn watch(state_file: &mut StateFile, exercises: &'static [Exercise]) -> Resu
                 watch_state.render()?;
             }
             WatchEvent::Input(InputEvent::Quit) => break,
-            WatchEvent::Input(InputEvent::Unrecognized) => {
-                watch_state.handle_invalid_cmd()?;
+            WatchEvent::Input(InputEvent::Unrecognized(cmd)) => {
+                watch_state.handle_invalid_cmd(&cmd)?;
             }
             WatchEvent::FileChange { exercise_ind } => {
                 // TODO: bool
diff --git a/src/watch/state.rs b/src/watch/state.rs
index 08707a4..751285f 100644
--- a/src/watch/state.rs
+++ b/src/watch/state.rs
@@ -159,8 +159,13 @@ You can keep working on this exercise or jump into the next one by removing the
         self.show_prompt()
     }
 
-    pub fn handle_invalid_cmd(&mut self) -> io::Result<()> {
-        self.writer.write_all(b"Invalid command")?;
+    pub fn handle_invalid_cmd(&mut self, cmd: &str) -> io::Result<()> {
+        self.writer.write_all(b"Invalid command: ")?;
+        self.writer.write_all(cmd.as_bytes())?;
+        if cmd.len() > 1 {
+            self.writer
+                .write_all(b" (confusing input can occur after resizing the terminal)")?;
+        }
         self.show_prompt()
     }
 }