diff --git a/screen-redraw.c b/screen-redraw.c
index 258c2fd2..3391a891 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -271,13 +271,19 @@ screen_redraw_type_of_cell(struct client *c, u_int px, u_int py,
 			borders |= 2;
 		if (screen_redraw_cell_border(c, px, py + 1, pane_status))
 			borders |= 1;
-	} else {
+	} else if (pane_status == PANE_STATUS_BOTTOM) {
 		if (py == 0 ||
 		    screen_redraw_cell_border(c, px, py - 1, pane_status))
 			borders |= 2;
 		if (py != sy - 1 &&
 		    screen_redraw_cell_border(c, px, py + 1, pane_status))
 			borders |= 1;
+	} else {
+		if (py == 0 ||
+		    screen_redraw_cell_border(c, px, py - 1, pane_status))
+			borders |= 2;
+		if (screen_redraw_cell_border(c, px, py + 1, pane_status))
+			borders |= 1;
 	}
 
 	/*