diff --git a/format.c b/format.c
index ec3839ef..126bbc14 100644
--- a/format.c
+++ b/format.c
@@ -297,7 +297,8 @@ format_job_get(struct format_tree *ft, const char *cmd)
 
 	t = time(NULL);
 	if (fj->job == NULL && (force || fj->last != t)) {
-		fj->job = job_run(expanded, NULL, NULL, format_job_update,
+		fj->job = job_run(expanded, NULL,
+		    server_client_get_cwd(ft->client, NULL), format_job_update,
 		    format_job_complete, NULL, fj, JOB_NOWAIT);
 		if (fj->job == NULL) {
 			free(fj->out);
diff --git a/job.c b/job.c
index 94e1d702..37c9c453 100644
--- a/job.c
+++ b/job.c
@@ -80,6 +80,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
 		return (NULL);
+	log_debug("%s: cmd=%s, cwd=%s", __func__, cmd, cwd);
 
 	/*
 	 * Do not set TERM during .tmux.conf, it is nice to be able to use