From fb87972f44a67507deba7349c9ced8c5c58f6cef Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Thu, 6 Nov 2025 15:36:23 -0800
Subject: [PATCH] settings_ui: Use any open workspace window when opening
 settings links (#42106)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/zed/src/main.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index e3fb37b902667848b4054cfaed0d61705b7d2287..be1c2464cc38c6710fdadffe41b94bf28c8abde4 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -859,15 +859,19 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut
                 // zed://settings/languages/Rust/tab_size  - SUPPORT
                 // languages.$(language).tab_size
                 // [ languages $(language) tab_size]
-                workspace::with_active_or_new_workspace(cx, |_workspace, window, cx| {
-                    match setting_path {
+                cx.spawn(async move |cx| {
+                    let workspace =
+                        workspace::get_any_active_workspace(app_state, cx.clone()).await?;
+
+                    workspace.update(cx, |_, window, cx| match setting_path {
                         None => window.dispatch_action(Box::new(zed_actions::OpenSettings), cx),
                         Some(setting_path) => window.dispatch_action(
                             Box::new(zed_actions::OpenSettingsAt { path: setting_path }),
                             cx,
                         ),
-                    }
-                });
+                    })
+                })
+                .detach_and_log_err(cx);
             }
         }