diff --git a/tty.c b/tty.c
index a58ca937..63380c29 100644
--- a/tty.c
+++ b/tty.c
@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
 		mode &= ~MODE_CURSOR;
 
 	changed = mode ^ tty->mode;
-	if (changed & (MODE_CURSOR|MODE_BLINKING)) {
-		if (mode & MODE_CURSOR) {
-			if (mode & MODE_BLINKING &&
-			    tty_term_has(tty->term, TTYC_CVVIS))
-				tty_putcode(tty, TTYC_CVVIS);
-			else
-				tty_putcode(tty, TTYC_CNORM);
-		} else
+	if (changed & MODE_BLINKING) {
+		if (tty_term_has(tty->term, TTYC_CVVIS))
+			tty_putcode(tty, TTYC_CVVIS);
+		else
+			tty_putcode(tty, TTYC_CNORM);
+		changed |= MODE_CURSOR;
+	}
+	if (changed & MODE_CURSOR) {
+		if (mode & MODE_CURSOR)
+			tty_putcode(tty, TTYC_CNORM);
+		else
 			tty_putcode(tty, TTYC_CIVIS);
 	}
 	if (s != NULL && tty->cstyle != s->cstyle) {