diff --git a/format.c b/format.c
index 3e158770..6d7e5bfe 100644
--- a/format.c
+++ b/format.c
@@ -1409,6 +1409,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 	format_add(ft, "pane_id", "%%%u", wp->id);
 	format_add(ft, "pane_active", "%d", wp == wp->window->active);
 	format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
+	format_add(ft, "pane_pipe", "%d", wp->pipe_fd != -1);
 
 	status = wp->status;
 	if (wp->fd == -1 && WIFEXITED(status))
diff --git a/tmux.1 b/tmux.1
index da97dd72..923f17b9 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3601,6 +3601,7 @@ The following variables are available, where appropriate:
 .It Li "pane_left" Ta "" Ta "Left of pane"
 .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any."
 .It Li "pane_pid" Ta "" Ta "PID of first process in pane"
+.It Li "pane_pipe" Ta "" Ta "1 if pane is being piped"
 .It Li "pane_right" Ta "" Ta "Right of pane"
 .It Li "pane_search_string" Ta "" Ta "Last search string in copy mode"
 .It Li "pane_start_command" Ta "" Ta "Command pane started with"
diff --git a/window-tree.c b/window-tree.c
index 7d4ddd2e..1ea1256e 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -512,7 +512,7 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
 		else
 			offset = (i * each);
 		if (loop == end - 1)
-			width = each - 1 + remaining;
+			width = each + remaining;
 		else
 			width = each - 1;
 
@@ -638,7 +638,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 		else
 			offset = (i * each);
 		if (loop == end - 1)
-			width = each - 1 + remaining;
+			width = each + remaining;
 		else
 			width = each - 1;