diff --git a/boot_diags/src/app.rs b/boot_diags/src/app.rs
index a047505..dcf8b84 100644
--- a/boot_diags/src/app.rs
+++ b/boot_diags/src/app.rs
@@ -134,9 +134,9 @@ impl App {
             Mode::ScanDisks => Mode::SelectDisks,
             Mode::SelectDisks => Mode::SelectParts,
             Mode::SelectParts => Mode::DiagMenu,
-            Mode::BootDiags | Mode::BootSetup | Mode::InjectDrivers | Mode::SetBootMode => {
-                Mode::DiagMenu
-            }
+            Mode::BootDiags | Mode::BootSetup => Mode::DiagMenu, // TODO: add Mode::ProgressReport
+            Mode::InjectDrivers | Mode::SetBootMode => Mode::DiagMenu,
+            Mode::Done => Mode::DiagMenu,
             Mode::Failed => Mode::Failed,
             // Default to current mode
             _ => self.cur_mode,
@@ -325,6 +325,9 @@ impl App {
                             self.action_tx.send(Action::SetMode(new_mode))?;
                         }
                     }
+                    Mode::Done => {
+                        self.action_tx.send(Action::NextScreen)?;
+                    }
                     Mode::BootDiags | Mode::BootSetup => {
                         let new_mode = self.next_mode();
                         self.action_tx.send(Action::SetMode(new_mode))?;
@@ -475,17 +478,13 @@ fn build_footer_string(cur_mode: Mode) -> String {
         Mode::DiagMenu | Mode::SelectParts => {
             String::from("(Enter) to select / (s) to start over / (q) to quit")
         }
+        Mode::Done => String::from("(Enter) to continue / (q) to quit"),
         Mode::SelectDisks => String::from(
             "(Enter) to select / / (i) to install driver / (r) to rescan / (q) to quit",
         ),
         Mode::Failed => String::from("(Enter) or (q) to quit"),
         // Invalid states
-        Mode::Confirm
-        | Mode::Clone
-        | Mode::PreClone
-        | Mode::PostClone
-        | Mode::Done
-        | Mode::SelectTableType => {
+        Mode::Confirm | Mode::Clone | Mode::PreClone | Mode::PostClone | Mode::SelectTableType => {
             panic!("This shouldn't happen?")
         }
     }
diff --git a/config/config.json5 b/config/config.json5
index 5f3f432..62d9b3a 100644
--- a/config/config.json5
+++ b/config/config.json5
@@ -82,7 +82,7 @@
       "<Ctrl-z>": "Suspend"
     },
     "Done": {
-      "<Enter>": "Quit",
+      "<Enter>": "Process",
       "<q>": "Quit",
       "<Ctrl-d>": "Quit",
       "<Ctrl-c>": "Quit",
diff --git a/deja_vu/src/app.rs b/deja_vu/src/app.rs
index 4c33576..8715929 100644
--- a/deja_vu/src/app.rs
+++ b/deja_vu/src/app.rs
@@ -378,6 +378,9 @@ impl App {
                     Mode::Confirm => {
                         self.action_tx.send(Action::NextScreen)?;
                     }
+                    Mode::Done => {
+                        self.action_tx.send(Action::Quit)?;
+                    }
                     _ => {}
                 },
                 Action::Resize(w, h) => self.handle_resize(tui, w, h)?,