diff --git a/src/ui/right_panel.rs b/src/ui/right_panel.rs
index 34480a3d..e6be72ca 100644
--- a/src/ui/right_panel.rs
+++ b/src/ui/right_panel.rs
@@ -706,10 +706,7 @@ impl Tty7App {
                 let connected_ssh = view
                     .remote_context()
                     .is_some_and(|c| c.kind == crate::daemon::protocol::RemoteKind::NativeSsh)
-                    && matches!(
-                        view.ssh_phase(),
-                        Some(crate::daemon::protocol::SshPhase::Connected)
-                    );
+                    && view.ssh_session_live();
                 if connected_ssh || view.workspace().is_some() {
                     forwards_pane = Some(view.pane_id);
                 }