diff --git a/server-client.c b/server-client.c
index c74e4dd5..cd301bbd 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1732,7 +1732,6 @@ server_client_check_redraw(struct client *c)
 
 	flags = tty->flags & (TTY_BLOCK|TTY_FREEZE|TTY_NOCURSOR);
 	tty->flags = (tty->flags & ~(TTY_BLOCK|TTY_FREEZE)) | TTY_NOCURSOR;
-	tty_update_mode(tty, mode, NULL);
 
 	if (~c->flags & CLIENT_REDRAWWINDOW) {
 		/*
@@ -1742,13 +1741,14 @@ 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);
+				tty_update_mode(tty, mode, NULL);
 				screen_redraw_pane(c, wp);
 			}
 		}
 	}
 
 	if (c->flags & CLIENT_ALLREDRAWFLAGS) {
+		tty_update_mode(tty, mode, NULL);
 		if (options_get_number(s->options, "set-titles"))
 			server_client_set_title(c);
 		screen_redraw_screen(c);