@@ -639,7 +639,7 @@ impl AutoDriveController {
             AutoControllerEffect::CancelCoordinator,
             AutoControllerEffect::SetTaskRunning { running: false },
             AutoControllerEffect::UpdateTerminalHint {
-                hint: Some("Press Esc again to exit Auto Drive".to_string()),
+                hint: Some("Press Esc to exit Auto Drive".to_string()),
             },
             AutoControllerEffect::TransientPause {
                 attempt: pending_attempt,
 
@@ -219,7 +219,8 @@ use crate::history::compat::{
 };
 
 pub(crate) const DOUBLE_ESC_HINT: &str = "undo timeline";
-const AUTO_ESC_EXIT_HINT: &str = "Press Esc again to exit Auto Drive";
+const AUTO_ESC_EXIT_HINT: &str = "Press Esc to exit Auto Drive";
+const AUTO_ESC_EXIT_HINT_DOUBLE: &str = "Press Esc again to exit Auto Drive";
 const AUTO_COMPLETION_CELEBRATION_DURATION: Duration = Duration::from_secs(5);
 const HISTORY_ANIMATION_FRAME_INTERVAL: Duration = Duration::from_millis(120);
 const AUTO_BOOTSTRAP_GOAL_PLACEHOLDER: &str = "Deriving goal from recent conversation";
@@ -3730,7 +3731,7 @@ impl ChatWidget<'_> {
         } else if self
             .bottom_pane
             .standard_terminal_hint()
-            .is_some_and(|hint| hint == AUTO_ESC_EXIT_HINT)
+            .is_some_and(|hint| hint == AUTO_ESC_EXIT_HINT || hint == AUTO_ESC_EXIT_HINT_DOUBLE)
         {
             self.bottom_pane.set_standard_terminal_hint(None);
         }
@@ -18653,7 +18654,7 @@ Have we met every part of this goal and is there no further work to do?"#
                     self.bottom_pane
                         .update_status_text("Auto Drive paused".to_string());
                     self.bottom_pane.set_standard_terminal_hint(Some(
-                        "Press Esc again to exit Auto Drive".to_string(),
+                        AUTO_ESC_EXIT_HINT.to_string(),
                     ));
                     let message = format!(
                         "Auto Drive will retry automatically in {human_delay} (attempt {attempt}). Last error: {reason}"
@@ -19740,6 +19741,7 @@ Have we met every part of this goal and is there no further work to do?"#
                 .clone()
                 .filter(|value| !value.trim().is_empty())
         };
+        let has_cli_prompt = cli_prompt.is_some();
 
         let bootstrap_pending = self.auto_pending_goal_request;
         let continue_cta_active = self.auto_should_show_continue_cta();
@@ -19758,7 +19760,6 @@ Have we met every part of this goal and is there no further work to do?"#
         };
 
         let button = if self.auto_state.awaiting_coordinator_submit() {
-            let has_cli_prompt = cli_prompt.is_some();
             let base_label = if bootstrap_pending {
                 "Complete Current Task"
             } else if has_cli_prompt {
@@ -19786,23 +19787,28 @@ Have we met every part of this goal and is there no further work to do?"#
                 Some("Edit the prompt, then press Enter to continue.".to_string())
             } else if bootstrap_pending {
                 None
+            } else if has_cli_prompt {
+                if countdown_active {
+                    Some("Enter to send now • Esc to edit".to_string())
+                } else {
+                    Some("Enter to send • Esc to edit".to_string())
+                }
             } else if continue_cta_active {
                 if countdown_active {
                     Some("Enter to continue now • Esc to stop".to_string())
                 } else {
                     Some("Enter to continue • Esc to stop".to_string())
                 }
             } else if countdown_active {
-                Some("Enter to send now • Esc to edit".to_string())
+                Some("Enter to send now • Esc to stop".to_string())
             } else {
-                Some("Enter to send • Esc to edit".to_string())
+                Some("Enter to send • Esc to stop".to_string())
             }
         } else {
             None
         };
 
         let ctrl_switch_hint = if self.auto_state.awaiting_coordinator_submit() {
-            let has_cli_prompt = cli_prompt.is_some();
             if self.auto_state.is_paused_manual() {
                 "Esc to cancel".to_string()
             } else if bootstrap_pending {
@@ -19812,7 +19818,7 @@ Have we met every part of this goal and is there no further work to do?"#
             } else if continue_cta_active {
                 "Esc to stop".to_string()
             } else {
-                "Esc to edit".to_string()
+                "Esc to stop".to_string()
             }
         } else if self.auto_state.is_waiting_for_response() {
             String::new()
@@ -30083,6 +30089,19 @@ use code_core::protocol::OrderMeta;
         assert!(!route.allows_double_esc);
     }
 
+    #[test]
+    fn esc_router_stops_auto_drive_while_waiting_for_response() {
+        let mut harness = ChatWidgetHarness::new();
+        let chat = harness.chat();
+
+        chat.auto_state.set_phase(AutoRunPhase::Active);
+        chat.auto_state.set_coordinator_waiting(true);
+
+        let route = chat.describe_esc_context();
+        assert_eq!(route.intent, EscIntent::AutoStopActive);
+        assert!(!route.allows_double_esc);
+    }
+
     #[test]
     fn esc_router_prioritizes_cli_interrupt_before_agent_cancel() {
         let mut harness = ChatWidgetHarness::new();
 
@@ -1,7 +1,7 @@
 use crossterm::event::KeyEvent;
 use std::time::{Duration, Instant};
 
-use super::{ChatWidget, AUTO_ESC_EXIT_HINT, DOUBLE_ESC_HINT};
+use super::{ChatWidget, AUTO_ESC_EXIT_HINT, AUTO_ESC_EXIT_HINT_DOUBLE, DOUBLE_ESC_HINT};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) enum EscIntent {
@@ -60,8 +60,13 @@ impl ChatWidget<'_> {
     }
 
     pub(super) fn show_auto_drive_exit_hint(&mut self) {
+        let hint = if self.auto_state.is_paused_manual() {
+            AUTO_ESC_EXIT_HINT_DOUBLE
+        } else {
+            AUTO_ESC_EXIT_HINT
+        };
         self.bottom_pane
-            .set_standard_terminal_hint(Some(AUTO_ESC_EXIT_HINT.to_string()));
+            .set_standard_terminal_hint(Some(hint.to_string()));
     }
 
     fn auto_stop_via_escape(&mut self, message: Option<String>) {
@@ -115,16 +120,16 @@ impl ChatWidget<'_> {
         }
 
         if self.auto_state.is_active() {
-            let awaiting_continue_cta = self.auto_should_show_continue_cta();
-
-            if awaiting_continue_cta {
-                return EscRoute::new(EscIntent::AutoStopDuringApproval, true, false);
-            }
-
-            if self.auto_state.countdown_active()
-                || (self.auto_state.awaiting_coordinator_submit()
-                    && !self.auto_state.is_paused_manual())
-            {
+            let prompt_visible = self.auto_state.awaiting_coordinator_submit()
+                && !self.auto_state.is_paused_manual()
+                && self
+                    .auto_state
+                    .current_cli_prompt
+                    .as_ref()
+                    .map(|prompt| !prompt.trim().is_empty())
+                    .unwrap_or(false);
+
+            if prompt_visible {
                 return EscRoute::new(EscIntent::AutoPauseForEdit, true, false);
             }
 
@@ -237,16 +242,17 @@ impl ChatWidget<'_> {
                 let had_running = self.is_task_running();
                 let auto_was_active = self.auto_state.is_active();
                 let _ = self.on_ctrl_c();
-                if had_running {
-                    if auto_was_active {
-                        self.bottom_pane.update_status_text(
-                            "Command cancelled. Esc stops Auto Drive.".to_string(),
-                        );
-                        self.auto_stop_via_escape(Some("Auto Drive stopped by user.".to_string()));
+                if auto_was_active {
+                    let status = if had_running {
+                        "Command cancelled. Esc stops Auto Drive."
                     } else {
-                        self.bottom_pane
-                            .update_status_text("Command cancelled.".to_string());
-                    }
+                        "Auto Drive stopped by user."
+                    };
+                    self.bottom_pane.update_status_text(status.to_string());
+                    self.auto_stop_via_escape(Some("Auto Drive stopped by user.".to_string()));
+                } else if had_running {
+                    self.bottom_pane
+                        .update_status_text("Command cancelled.".to_string());
                 }
                 true
             }