4 files changed, 8 insertions, 6 deletions
diff --git a/cmd.c b/cmd.c
index 021c0332..3a341b4e 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1298,7 +1298,7 @@ cmd_get_default_path(struct cmd_ctx *ctx, const char *cwd)
 		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
 			root = ctx->cmdclient->cwd;
 		else if (ctx->curclient != NULL && s->curw != NULL)
-			root = get_proc_cwd(s->curw->window->active->pid);
+			root = get_proc_cwd(s->curw->window->active->fd);
 		else
 			return (s->cwd);
 		skip = 0;
diff --git a/format.c b/format.c
index bc638448..0eeb622d 100644
--- a/format.c
+++ b/format.c
@@ -391,7 +391,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
 		format_add(ft, "pane_start_command", "%s", wp->cmd);
 	if (wp->cwd != NULL)
 		format_add(ft, "pane_start_path", "%s", wp->cwd);
-	format_add(ft, "pane_current_path", "%s", get_proc_cwd(wp->pid));
+	format_add(ft, "pane_current_path", "%s", get_proc_cwd(wp->fd));
 	format_add(ft, "pane_pid", "%ld", (long) wp->pid);
 	format_add(ft, "pane_tty", "%s", wp->tty);
 }
diff --git a/procname.c b/procname.c
index 370fe342..1928b92e 100644
--- a/procname.c
+++ b/procname.c
@@ -36,7 +36,7 @@
 
 struct kinfo_proc	*cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
 char			*get_proc_name(int, char *);
-char			*get_proc_cwd(pid_t);
+char			*get_proc_cwd(int);
 
 struct kinfo_proc *
 cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2)
@@ -133,12 +133,14 @@ error:
 }
 
 char*
-get_proc_cwd(pid_t pid)
+get_proc_cwd(int fd)
 {
-	int		name[] = { CTL_KERN, KERN_PROC_CWD, (int)pid };
+	int		name[] = { CTL_KERN, KERN_PROC_CWD, 0 };
 	static char	path[MAXPATHLEN];
 	size_t		pathlen = sizeof path;
 
+	if ((name[2] = tcgetpgrp(fd)) == -1)
+		return (NULL);
 	if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0)
 		return (NULL);
 	return (path);
diff --git a/tmux.h b/tmux.h
index c208361b..90019bf2 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2277,7 +2277,7 @@ u_int	utf8_split2(u_int, u_char *);
 
 /* procname.c */
 char   *get_proc_name(int, char *);
-char   *get_proc_cwd(pid_t);
+char   *get_proc_cwd(int);
 
 /* log.c */
 void		 log_open(int, const char *);