diff --git a/layout.c b/layout.c
index 6e78b439..e84da936 100644
--- a/layout.c
+++ b/layout.c
@@ -272,7 +272,7 @@ layout_fix_panes(struct window *w)
 		wp->xoff = lc->xoff;
 		wp->yoff = lc->yoff;
 
-		if (shift && status == 1)
+		if (shift && status == PANE_STATUS_TOP)
 			wp->yoff += 1;
 
 		window_pane_resize(wp, lc->sx, lc->sy - shift);
@@ -1021,7 +1021,7 @@ layout_spread_cell(struct window *w, struct layout_cell *parent)
 
 	number = 0;
 	TAILQ_FOREACH (lc, &parent->cells, entry)
-	    number++;
+		number++;
 	if (number <= 1)
 		return (0);
 	status = options_get_number(w->options, "pane-border-status");
diff --git a/window.c b/window.c
index 8108600d..65097e1c 100644
--- a/window.c
+++ b/window.c
@@ -1368,7 +1368,7 @@ window_pane_find_down(struct window_pane *wp)
 		if (edge >= w->sy - 1)
 			edge = 0;
 	} else {
-		if (edge >= wp->sy)
+		if (edge >= w->sy)
 			edge = 0;
 	}