diff --git a/screen-redraw.c b/screen-redraw.c
index c510fb68..c9e70590 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -438,17 +438,24 @@ screen_redraw_screen(struct client *c)
 	tty_sync_start(&c->tty);
 
 	if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) {
+		log_debug("%s: redrawing borders", c->name);
 		if (ctx.pane_status != PANE_STATUS_OFF)
 			screen_redraw_draw_pane_status(&ctx);
 		screen_redraw_draw_borders(&ctx);
 	}
-	if (flags & CLIENT_REDRAWWINDOW)
+	if (flags & CLIENT_REDRAWWINDOW) {
+		log_debug("%s: redrawing panes", c->name);
 		screen_redraw_draw_panes(&ctx);
+	}
 	if (ctx.statuslines != 0 &&
-	    (flags & (CLIENT_REDRAWSTATUS|CLIENT_REDRAWSTATUSALWAYS)))
+	    (flags & (CLIENT_REDRAWSTATUS|CLIENT_REDRAWSTATUSALWAYS))) {
+		log_debug("%s: redrawing status", c->name);
 		screen_redraw_draw_status(&ctx);
-	if (c->overlay_draw != NULL && (flags & CLIENT_REDRAWOVERLAY))
+	}
+	if (c->overlay_draw != NULL && (flags & CLIENT_REDRAWOVERLAY)) {
+		log_debug("%s: redrawing overlay", c->name);
 		c->overlay_draw(c, &ctx);
+	}
 
 	tty_reset(&c->tty);
 	tty_sync_end(&c->tty);
diff --git a/server-client.c b/server-client.c
index 214e828f..36d3e5f4 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1739,6 +1739,7 @@ server_client_check_redraw(struct client *c)
 		 */
 		TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
 			if (wp->flags & PANE_REDRAW) {
+				log_debug("%s: redrawing pane %%%u", __func__, wp->id);
 				tty_update_mode(tty, tty->mode, NULL);
 				screen_redraw_pane(c, wp);
 			}
diff --git a/tmux.h b/tmux.h
index a541a84e..795baabc 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1246,6 +1246,7 @@ struct tty {
 #define TTY_BLOCK 0x80
 #define TTY_HAVEDA 0x100
 #define TTY_HAVEDSR 0x200
+#define TTY_SYNCING 0x400
 	int		 flags;
 
 	struct tty_term	*term;
diff --git a/tty.c b/tty.c
index 82436959..92827f5d 100644
--- a/tty.c
+++ b/tty.c
@@ -1438,15 +1438,19 @@ tty_draw_line(struct tty *tty, struct window_pane *wp, struct screen *s,
 void
 tty_sync_start(struct tty *tty)
 {
-	if (tty_get_flags(tty) & TERM_SYNC)
+	if ((~tty->flags & TTY_SYNCING) && (tty_get_flags(tty) & TERM_SYNC)) {
 		tty_puts(tty, "\033P=1s\033\\");
+		tty->flags |= TTY_SYNCING;
+	}
 }
 
 void
 tty_sync_end(struct tty *tty)
 {
-	if (tty_get_flags(tty) & TERM_SYNC)
+	if (tty_get_flags(tty) & TERM_SYNC) {
 		tty_puts(tty, "\033P=2s\033\\");
+		tty->flags &= ~TTY_SYNCING;
+	}
 }
 
 static int