1 files changed, 4 insertions, 1 deletions
diff --git a/src/macos.zig b/src/macos.zig
index 75834844..9b17803b 100644
--- a/src/macos.zig
+++ b/src/macos.zig
@@ -2450,7 +2450,10 @@ fn spawnShell(ctx: ?*anyopaque, pane: u8, cwd: []const u8) void {
         .cmd = .{ .watched = (if (core.panes[pane]) |pn| pn.command != null else false) and host_io.watchExit(child.pid), .fd = child.file.handle },
     };
     var lbuf: [1024]u8 = undefined;
-    if (host_io.shellCwd(child.pid, &lbuf)) |wd| core.setCwd(pane, wd);
+    // Only a shell given no directory is asked where it is: one given a
+    // directory is named by it already (newShell), and asked now, before
+    // its chdir, it would answer this process's, a rename to undo.
+    if (cwd.len == 0) if (host_io.shellCwd(child.pid, &lbuf)) |wd| core.setCwd(pane, wd);
     if (st.started) if (st.ptys[pane]) |*pt| startReader(st, pt, pane);
 }