1 files changed, 4 insertions, 1 deletions
diff --git a/src/tty/tty.zig b/src/tty/tty.zig
index a41e42e2..762616f5 100644
--- a/src/tty/tty.zig
+++ b/src/tty/tty.zig
@@ -1249,7 +1249,10 @@ const Shell = struct {
         const command = if (s.core.panes[pane]) |pn| pn.command != null else false;
         s.ptys[pane] = .{ .file = child.file, .pid = child.pid, .reader = .{ .any_future = null, .result = {} }, .cmd = .{ .watched = command and host_io.watchExit(child.pid), .fd = child.file.handle } };
         var lbuf: [pardes.memory.limits.host_path_cap + 1]u8 = undefined;
-        if (host_io.shellCwd(child.pid, &lbuf)) |wd| s.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| s.core.setCwd(pane, wd);
         if (s.threads_ok) {
             if (s.ptys[pane]) |*pt| {
                 pt.reader = s.io.concurrent(readPty, .{ s.io, s.gpa, pt.file, @as(usize, pane), s.gens[pane], s.loop }) catch pt.reader;