From 6d2be70408a63d372b9443aab90c41bfb3957f70 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Tue, 3 Mar 2026 22:42:48 +0000
Subject: [PATCH] Fix panic in remote workspaces (#50647) (cherry-pick to
 preview) (#50650)

Cherry-pick of #50647 to preview

----
Fixes ZED-4JD

Release Notes:

- Fix a panic when opening the remote server modal

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/recent_projects/src/remote_servers.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 8bddcf37270e56932e75635fcd35616d12309b6e..84157c10f8a0517379dcd21042ccdabc71665ecb 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -1161,12 +1161,11 @@ impl RemoteServerProjects {
                 workspace.toggle_modal(window, cx, |window, cx| {
                     RemoteConnectionModal::new(&connection_options, Vec::new(), window, cx)
                 });
-                let prompt = workspace
-                    .active_modal::<RemoteConnectionModal>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .prompt
-                    .clone();
+                // can be None if another copy of this modal opened in the meantime
+                let Some(modal) = workspace.active_modal::<RemoteConnectionModal>(cx) else {
+                    return;
+                };
+                let prompt = modal.read(cx).prompt.clone();
 
                 let connect = connect(
                     ConnectionIdentifier::setup(),