diff --git a/screen-redraw.c b/screen-redraw.c
index 70f94a28..e63f8725 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -166,7 +166,7 @@ screen_redraw_screen(struct client *c, int status_only)
 
 		/* Draw the pane. */
 		for (i = 0; i < wp->sy; i++) {
-			if (status_only && i != tty->sy - 1)
+			if (status_only && wp->yoff + i != tty->sy - 1)
 				continue;
 			tty_draw_line(tty, wp->screen, i, wp->xoff, wp->yoff);
 		}
diff --git a/status.c b/status.c
index e2ffa0a7..60d7799c 100644
--- a/status.c
+++ b/status.c
@@ -494,7 +494,7 @@ status_message_clear(struct client *c)
 	c->message_string = NULL;
 
 	c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
-	c->flags |= CLIENT_REDRAW;
+	c->flags |= CLIENT_STATUS;
 
 	screen_reinit(&c->status);
 }
@@ -581,7 +581,7 @@ status_prompt_clear(struct client *c)
 	c->prompt_buffer = NULL;
 
 	c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
-	c->flags |= CLIENT_REDRAW;
+	c->flags |= CLIENT_STATUS;
 
 	screen_reinit(&c->status);
 }