diff --git a/src/shared/tmux/tmux-utils/pane-replace.ts b/src/shared/tmux/tmux-utils/pane-replace.ts
index 728041a64..ac822684d 100644
--- a/src/shared/tmux/tmux-utils/pane-replace.ts
+++ b/src/shared/tmux/tmux-utils/pane-replace.ts
@@ -34,7 +34,7 @@ export async function replaceTmuxPane(
 	})
 	await ctrlCProc.exited
 
-	const opencodeCmd = `opencode attach ${serverUrl} --session ${sessionId}`
+	const opencodeCmd = `zsh -c 'opencode attach ${serverUrl} --session ${sessionId}'`
 
 	const proc = spawn([tmux, "respawn-pane", "-k", "-t", paneId, opencodeCmd], {
 		stdout: "pipe",
diff --git a/src/shared/tmux/tmux-utils/pane-spawn.ts b/src/shared/tmux/tmux-utils/pane-spawn.ts
index 959a4e68c..9b18f385b 100644
--- a/src/shared/tmux/tmux-utils/pane-spawn.ts
+++ b/src/shared/tmux/tmux-utils/pane-spawn.ts
@@ -48,7 +48,7 @@ export async function spawnTmuxPane(
 
 	log("[spawnTmuxPane] all checks passed, spawning...")
 
-	const opencodeCmd = `opencode attach ${serverUrl} --session ${sessionId}`
+	const opencodeCmd = `zsh -c 'opencode attach ${serverUrl} --session ${sessionId}'`
 
 	const args = [
 		"split-window",