diff --git a/codex-rs/tui/src/chatwidget/safety_buffering.rs b/codex-rs/tui/src/chatwidget/safety_buffering.rs
index 50d0ad75e8..f46423f81d 100644
--- a/codex-rs/tui/src/chatwidget/safety_buffering.rs
+++ b/codex-rs/tui/src/chatwidget/safety_buffering.rs
@@ -9,6 +9,7 @@ const SAFETY_BUFFERING_LEARN_MORE_URL: &str = "https://help.openai.com/en/articl
 const SAFETY_BUFFERING_HEADER: &str =
     "Our systems are thinking a bit more about this request before responding.";
 const SAFETY_BUFFERING_MESSAGE_WITH_RETRY: &str = "Hang tight or retry with a faster model for a quicker response, though it may be less capable of handling complex requests.";
+const SAFETY_BUFFERING_FOOTER: &str = "No action is required. Codex will keep waiting, and this menu will close when the response is ready.";
 
 #[derive(Debug)]
 struct ActiveSafetyBuffering {
@@ -184,7 +185,7 @@ impl ChatWidget {
         }
         items.extend([
             SelectionItem {
-                name: "Keep waiting".to_string(),
+                name: "Dismiss and keep waiting".to_string(),
                 dismiss_on_select: true,
                 ..Default::default()
             },
@@ -201,6 +202,8 @@ impl ChatWidget {
         self.bottom_pane.show_selection_view(SelectionViewParams {
             view_id: Some(SAFETY_BUFFERING_PROMPT_VIEW_ID),
             header: Box::new(header),
+            footer_note: Some(Line::from(SAFETY_BUFFERING_FOOTER).dim()),
+            footer_hint: Some(Line::default()),
             items,
             ..Default::default()
         });
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_retry_prompt.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_retry_prompt.snap
index 0a038ca70c..767c9c393b 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_retry_prompt.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_retry_prompt.snap
@@ -7,7 +7,8 @@ expression: popup
   may be less capable of handling complex requests.
 
 › 1. Retry with a faster model
-  2. Keep waiting
+  2. Dismiss and keep waiting
   3. Learn more
 
-  Press enter to confirm or esc to go back
+  No action is required. Codex will keep waiting, and this menu will close when
+  the response is ready.
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_status_without_retry.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_status_without_retry.snap
index 85570b3ebc..56efb00764 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_status_without_retry.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__safety_buffering_status_without_retry.snap
@@ -4,7 +4,8 @@ expression: popup
 ---
   Our systems are thinking a bit more about this request before responding.
 
-› 1. Keep waiting
+› 1. Dismiss and keep waiting
   2. Learn more
 
-  Press enter to confirm or esc to go back
+  No action is required. Codex will keep waiting, and this menu will close when
+  the response is ready.