diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 49129532603625b48ac86ba506ad3ff1014f30d3..520f6e6cf2e05595a2f35b194cb65ffe135b4814 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1217,7 +1217,9 @@ mod mac_os {
         string::kCFStringEncodingUTF8,
         url::{CFURL, CFURLCreateWithBytes},
     };
-    use core_services::{LSLaunchURLSpec, LSOpenFromURLSpec, kLSLaunchDefaults};
+    use core_services::{
+        LSLaunchURLSpec, LSOpenFromURLSpec, kLSLaunchDefaults, kLSLaunchDontSwitch,
+    };
     use serde::Deserialize;
     use std::{
         ffi::OsStr,
@@ -1316,7 +1318,7 @@ mod mac_os {
                                 appURL: app_url.as_concrete_TypeRef(),
                                 itemURLs: urls_to_open.as_concrete_TypeRef(),
                                 passThruParams: ptr::null(),
-                                launchFlags: kLSLaunchDefaults,
+                                launchFlags: kLSLaunchDefaults | kLSLaunchDontSwitch,
                                 asyncRefCon: ptr::null_mut(),
                             },
                             ptr::null_mut(),
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
index e1a98e62a0f3384fbf003cb0705de1b0bb957d75..aa55ef543802a7271f2a3c935b14b6cedd26e767 100644
--- a/crates/zed/src/zed/open_listener.rs
+++ b/crates/zed/src/zed/open_listener.rs
@@ -482,6 +482,7 @@ pub async fn handle_cli_connection(
                             cx,
                         ) {
                             Ok(open_request) => {
+                                cx.activate(true);
                                 handle_open_request(open_request, app_state.clone(), cx);
                                 responses.send(CliResponse::Exit { status: 0 }).log_err();
                             }
@@ -518,6 +519,8 @@ pub async fn handle_cli_connection(
                     }
                 }
 
+                cx.update(|cx| cx.activate(true));
+
                 let open_workspace_result = open_workspaces(
                     paths,
                     diff_paths,