diff --git a/src/watch.rs b/src/watch.rs
index 928fc5fb..357b5c71 100644
--- a/src/watch.rs
+++ b/src/watch.rs
@@ -26,9 +26,9 @@ use self::{
 enum WatchEvent {
     Input(InputEvent),
     FileChange { exercise_ind: usize },
+    TerminalResize,
     NotifyErr(notify::Error),
     TerminalEventErr(io::Error),
-    TerminalResize,
 }
 
 /// Returned by the watch mode to indicate what to do afterwards.
@@ -60,15 +60,15 @@ pub fn watch(app_state: &mut AppState) -> Result<WatchExit> {
 
     while let Ok(event) = rx.recv() {
         match event {
+            WatchEvent::Input(InputEvent::Next) => {
+                watch_state.next_exercise()?;
+            }
             WatchEvent::Input(InputEvent::Hint) => {
                 watch_state.show_hint()?;
             }
             WatchEvent::Input(InputEvent::List) => {
                 return Ok(WatchExit::List);
             }
-            WatchEvent::TerminalResize => {
-                watch_state.render()?;
-            }
             WatchEvent::Input(InputEvent::Quit) => break,
             WatchEvent::Input(InputEvent::Unrecognized(cmd)) => {
                 watch_state.handle_invalid_cmd(&cmd)?;
@@ -76,6 +76,9 @@ pub fn watch(app_state: &mut AppState) -> Result<WatchExit> {
             WatchEvent::FileChange { exercise_ind } => {
                 watch_state.run_exercise_with_ind(exercise_ind)?;
             }
+            WatchEvent::TerminalResize => {
+                watch_state.render()?;
+            }
             WatchEvent::NotifyErr(e) => {
                 return Err(Error::from(e).context("Exercise file watcher failed"))
             }
diff --git a/src/watch/state.rs b/src/watch/state.rs
index 5a5c0ca1..462633d1 100644
--- a/src/watch/state.rs
+++ b/src/watch/state.rs
@@ -6,7 +6,10 @@ use crossterm::{
 };
 use std::io::{self, StdoutLock, Write};
 
-use crate::{app_state::AppState, progress_bar::progress_bar};
+use crate::{
+    app_state::{AppState, ExercisesProgress},
+    progress_bar::progress_bar,
+};
 
 pub struct WatchState<'a> {
     writer: StdoutLock<'a>,
@@ -58,9 +61,27 @@ impl<'a> WatchState<'a> {
         self.run_current_exercise()
     }
 
+    pub fn next_exercise(&mut self) -> Result<()> {
+        if !self.show_done {
+            self.writer
+                .write_all(b"The current exercise isn't done yet\n")?;
+            self.show_prompt()?;
+            return Ok(());
+        }
+
+        match self.app_state.done_current_exercise()? {
+            ExercisesProgress::AllDone => todo!(),
+            ExercisesProgress::Pending => self.run_current_exercise(),
+        }
+    }
+
     fn show_prompt(&mut self) -> io::Result<()> {
         self.writer.write_all(b"\n")?;
 
+        if self.show_done {
+            self.writer.write_fmt(format_args!("{}ext/", 'n'.bold()))?;
+        }
+
         if !self.show_hint {
             self.writer.write_fmt(format_args!("{}int/", 'h'.bold()))?;
         }
diff --git a/src/watch/terminal_event.rs b/src/watch/terminal_event.rs
index faca8a2b..7f7ebe06 100644
--- a/src/watch/terminal_event.rs
+++ b/src/watch/terminal_event.rs
@@ -4,6 +4,7 @@ use std::sync::mpsc::Sender;
 use super::WatchEvent;
 
 pub enum InputEvent {
+    Next,
     Hint,
     List,
     Quit,
@@ -38,6 +39,7 @@ pub fn terminal_event_handler(tx: Sender<WatchEvent>) {
                 match key.code {
                     KeyCode::Enter => {
                         let input_event = match input.trim() {
+                            "n" | "next" => InputEvent::Next,
                             "h" | "hint" => InputEvent::Hint,
                             "l" | "list" => break InputEvent::List,
                             "q" | "quit" => break InputEvent::Quit,