diff --git a/screen-write.c b/screen-write.c
index dabdf58b..6bd3fe90 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1124,7 +1124,6 @@ screen_write_redraw_line(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
 	struct visible_ranges	*r;
 	struct visible_range	*ri;
 
-
 	r = screen_redraw_get_visible_ranges(wp, xoff, yoff + yy, sx, NULL);
 	for (i = 0; i < r->used; i++) {
 		ri = &r->ranges[i];
@@ -1133,7 +1132,7 @@ screen_write_redraw_line(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
 
 		cx = ri->px - xoff;
 		for (n = 0; n < ri->nx && cx < sx; n++, cx++) {
-			grid_view_get_cell(s->grid, cx, s->cy, &gc);
+			grid_view_get_cell(s->grid, cx, yy, &gc);
 			ttyctx->ocx = cx;
 			ttyctx->ocy = yy;
 			ttyctx->cell = &gc;
@@ -2109,6 +2108,7 @@ static void
 screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
     const char *from)
 {
+	struct window_pane		*wp = ctx->wp;
 	struct screen			*s = ctx->s;
 	struct screen_write_citem	*ci, *tmp;
 	struct screen_write_cline	*cl;
@@ -2120,37 +2120,30 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
 	struct tty_ctx			 ttyctx;
 	struct visible_ranges		*r;
 	struct visible_range		*ri;
-	struct window_pane		*wp = ctx->wp;
 
-	if (s->mode & MODE_SYNC) {
-		for (y = 0; y < screen_size_y(s); y++) {
-			cl = &ctx->s->write_list[y];
-			TAILQ_FOREACH_SAFE(ci, &cl->items, entry, tmp) {
-				TAILQ_REMOVE(&cl->items, ci, entry);
-				screen_write_free_citem(ci);
-			}
-		}
-		return;
-	}
+	if (s->mode & MODE_SYNC)
+		goto discard;
 
 	if (ctx->scrolled != 0) {
+		screen_write_initctx(ctx, &ttyctx, 1, 1);
+		if (ttyctx.flags & TTY_CTX_PANE_OBSCURED && wp != NULL) {
+			screen_write_redraw_pane(ctx, &ttyctx);
+			goto discard;
+		}
+
 		log_debug("%s: scrolled %u (region %u-%u)", __func__,
 		    ctx->scrolled, s->rupper, s->rlower);
 		if (ctx->scrolled > s->rlower - s->rupper + 1)
 			ctx->scrolled = s->rlower - s->rupper + 1;
 
-		screen_write_initctx(ctx, &ttyctx, 1, 1);
 		if (wp != NULL && wp->yoff + wp->sy > wp->window->sy)
-			 ttyctx.orlower -= (wp->yoff + wp->sy - wp->window->sy);
+			ttyctx.orlower -= (wp->yoff + wp->sy - wp->window->sy);
 		ttyctx.n = ctx->scrolled;
 		ttyctx.bg = ctx->bg;
 		tty_write(tty_cmd_scrollup, &ttyctx);
-		if (wp != NULL)
-			log_debug("%s: after scrollup, PANE_REDRAW=%d for %%%u",
-			    __func__, !!(wp->flags & PANE_REDRAW), wp->id);
 
 		if (wp != NULL)
-			ctx->wp->flags |= PANE_REDRAWSCROLLBAR;
+			wp->flags |= PANE_REDRAWSCROLLBAR;
 	}
 	ctx->scrolled = 0;
 	ctx->bg = 8;
@@ -2183,16 +2176,6 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
 		    NULL);
 
 		last = UINT_MAX;
-		if (y == (u_int)s->cy || !TAILQ_EMPTY(&cl->items)) {
-			u_int dbg_cnt = 0;
-			struct screen_write_citem *dbg_ci;
-			TAILQ_FOREACH(dbg_ci, &cl->items, entry) dbg_cnt++;
-			log_debug("%s: row y=%u has %u items (wp_xoff=%d yoff=%d wsx=%u)",
-			    __func__, y, dbg_cnt,
-			    wp ? (int)wp->xoff : -1,
-			    wp ? (int)wp->yoff : -1,
-			    wsx);
-		}
 		TAILQ_FOREACH_SAFE(ci, &cl->items, entry, tmp) {
 			log_debug("collect list: x=%u (last %u), y=%u, used=%u",
 			    ci->x, last, y, ci->used);
@@ -2258,6 +2241,18 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
 	s->cx = cx; s->cy = cy;
 
 	log_debug("%s: flushed %u items (%s)", __func__, items, from);
+	return;
+
+discard:
+	for (y = 0; y < screen_size_y(s); y++) {
+		cl = &ctx->s->write_list[y];
+		TAILQ_FOREACH_SAFE(ci, &cl->items, entry, tmp) {
+			TAILQ_REMOVE(&cl->items, ci, entry);
+			screen_write_free_citem(ci);
+		}
+	}
+	ctx->scrolled = 0;
+	ctx->bg = 8;
 }
 
 /* Insert an item on current line. */