diff --git a/CLI/cmux.swift b/CLI/cmux.swift
index 26fe7e78..3c90fe9d 100644
--- a/CLI/cmux.swift
+++ b/CLI/cmux.swift
@@ -1955,6 +1955,8 @@ struct CMUXCLI {
         guard let workspaceId = workspaceCreate["workspace_id"] as? String, !workspaceId.isEmpty else {
             throw CLIError(message: "workspace.create did not return workspace_id")
         }
+        let workspaceWindowId = (workspaceCreate["window_id"] as? String)?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
 
         if let workspaceName = sshOptions.workspaceName?.trimmingCharacters(in: .whitespacesAndNewlines),
            !workspaceName.isEmpty {
@@ -1985,6 +1987,11 @@ struct CMUXCLI {
         }
 
         var payload = try client.sendV2(method: "workspace.remote.configure", params: configureParams)
+        var selectParams: [String: Any] = ["workspace_id": workspaceId]
+        if let workspaceWindowId, !workspaceWindowId.isEmpty {
+            selectParams["window_id"] = workspaceWindowId
+        }
+        _ = try client.sendV2(method: "workspace.select", params: selectParams)
 
         payload["ssh_command"] = sshCommand
         payload["ssh_startup_command"] = sshStartupCommand
diff --git a/tests_v2/test_ssh_remote_cli_relay.py b/tests_v2/test_ssh_remote_cli_relay.py
index 2ba2afcf..2e189f04 100644
--- a/tests_v2/test_ssh_remote_cli_relay.py
+++ b/tests_v2/test_ssh_remote_cli_relay.py
@@ -63,7 +63,7 @@ def _run_cli_json(cli: str, args: list[str]) -> dict:
     env.pop("CMUX_SURFACE_ID", None)
     env.pop("CMUX_TAB_ID", None)
 
-    proc = _run([cli, "--socket", SOCKET_PATH, "--json", *args], env=env)
+    proc = _run([cli, "--socket", SOCKET_PATH, "--json", "--id-format", "both", *args], env=env)
     try:
         return json.loads(proc.stdout or "{}")
     except Exception as exc:  # noqa: BLE001
@@ -204,6 +204,14 @@ def main() -> int:
                         workspace_id = str(row.get("id") or "")
                         break
             _must(bool(workspace_id), f"cmux ssh output missing workspace_id: {payload}")
+            workspace_window_id = payload.get("window_id")
+            current_params = {"window_id": workspace_window_id} if isinstance(workspace_window_id, str) and workspace_window_id else {}
+            current = client._call("workspace.current", current_params) or {}
+            current_workspace_id = str(current.get("workspace_id") or "")
+            _must(
+                current_workspace_id == workspace_id,
+                f"cmux ssh should focus created workspace: current={current_workspace_id!r} created={workspace_id!r}",
+            )
 
             remote_relay_port = payload.get("remote_relay_port")
             _must(remote_relay_port is not None, f"cmux ssh output missing remote_relay_port: {payload}")