diff --git a/codex-rs/tui/src/fork_turn_picker.rs b/codex-rs/tui/src/fork_turn_picker.rs
index c2a8e550f7..99a1c56ee5 100644
--- a/codex-rs/tui/src/fork_turn_picker.rs
+++ b/codex-rs/tui/src/fork_turn_picker.rs
@@ -25,7 +25,6 @@ use ratatui::layout::Layout;
 use ratatui::layout::Rect;
 use ratatui::style::Stylize as _;
 use ratatui::text::Line;
-use ratatui::text::Span;
 use ratatui::widgets::Block;
 use ratatui::widgets::Borders;
 use ratatui::widgets::Clear;
@@ -354,7 +353,7 @@ impl ForkTurnPickerScreen {
             .constraints([
                 Constraint::Length(3),
                 Constraint::Min(6),
-                Constraint::Length(11),
+                Constraint::Length(9),
                 Constraint::Length(2),
             ])
             .split(area);
@@ -456,9 +455,14 @@ impl ForkTurnPickerScreen {
     }
 
     fn render_selected_preview(&self, area: Rect, buf: &mut Buffer) {
-        let block = Block::default()
-            .borders(Borders::ALL)
-            .title("Selected turn");
+        let display_number = self.display_turn_number(self.selected);
+        let is_latest = self.selected + 1 == self.turns.len();
+        let title = if is_latest {
+            format!("Selected turn: {display_number} (latest)")
+        } else {
+            format!("Selected turn: {display_number}")
+        };
+        let block = Block::default().borders(Borders::ALL).title(title);
         let inner = block.inner(area);
         block.render(area, buf);
 
@@ -467,7 +471,6 @@ impl ForkTurnPickerScreen {
         }
 
         let selected = &self.turns[self.selected];
-        let display_number = self.display_turn_number(self.selected);
         let newer_turns = self
             .turns
             .len()
@@ -485,20 +488,8 @@ impl ForkTurnPickerScreen {
             .unwrap_or("[no model response recorded]");
 
         let lines = vec![
-            Line::from(vec![
-                "Selected: ".dim(),
-                format!("{display_number}:").cyan(),
-                if self.selected + 1 == self.turns.len() {
-                    Span::from(" (latest)").dim()
-                } else {
-                    Span::from("")
-                },
-            ]),
-            Line::from(""),
-            Line::from("User request".dim()),
             Line::from(selected.user_request.clone()),
             Line::from(""),
-            Line::from("Model response".dim()),
             Line::from(model_response).dim(),
             Line::from(""),
             Line::from(status_line).dim(),
diff --git a/codex-rs/tui/src/snapshots/codex_tui__fork_turn_picker__tests__fork_turn_picker.snap b/codex-rs/tui/src/snapshots/codex_tui__fork_turn_picker__tests__fork_turn_picker.snap
index b13f9f47cc..ca49f2033b 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__fork_turn_picker__tests__fork_turn_picker.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__fork_turn_picker__tests__fork_turn_picker.snap
@@ -10,16 +10,16 @@ Choose a turn from the current conversation to fork after.
 │      Short answer: not via the current app-server protocol.              │
 │› 2: Please also handle macOS path edge cases when filenames contain ...  │
 │      Acknowledged. I will cover macOS path handling and spaces.          │
+│  3: One more thing: include tests for rollback + fork interaction        │
+│      I added coverage for rollback semantics in the turn extraction he...│
 └──────────────────────────────────────────────────────────────────────────┘
-┌Selected turn─────────────────────────────────────────────────────────────┐
-│Selected: 2:                                                              │
-│                                                                          │
-│User request                                                              │
+┌Selected turn: 2──────────────────────────────────────────────────────────┐
 │Please also handle macOS path edge cases when filenames contain spaces    │
 │                                                                          │
-│Model response                                                            │
 │Acknowledged. I will cover macOS path handling and spaces.                │
 │                                                                          │
 │Forking here omits 1 newer turn from the new thread.                      │
+│                                                                          │
+│                                                                          │
 └──────────────────────────────────────────────────────────────────────────┘
 Use ↑/↓ (or j/k) to choose, enter to fork, esc to cancel, digits jump to row