diff --git a/src/main.c b/src/main.c
index 5545cc4..8001c3f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1380,27 +1380,20 @@
 	    validate_cursor();
 
 #ifdef FEAT_SYN_HL
-	    if (curwin->w_p_cul && curwin->w_p_wrap
-				&& (curwin->w_p_culopt_flags & CULOPT_SCRLINE))
-		must_redraw = NOT_VALID;
+	    // Might need to update for 'cursorline'.
+	    // When 'cursorlineopt' is "screenline" need to redraw always.
+	    if (curwin->w_p_cul
+		    && (curwin->w_last_cursorline != curwin->w_cursor.lnum
+			|| (curwin->w_p_culopt_flags & CULOPT_SCRLINE))
+		    && !char_avail())
+		redraw_later(VALID);
 #endif
-
 	    if (VIsual_active)
 		update_curbuf(INVERTED); // update inverted part
 	    else if (must_redraw)
 	    {
 		mch_disable_flush();	// Stop issuing gui_mch_flush().
-#ifdef FEAT_SYN_HL
-		// Might need some more update for the cursorscreen line.
-		// TODO: can we optimize this?
-		if (curwin->w_p_cul
-			&& curwin->w_p_wrap
-			&& (curwin->w_p_culopt_flags & CULOPT_SCRLINE)
-			&& !char_avail())
-		    update_screen(VALID);
-		else
-#endif
-		    update_screen(0);
+		update_screen(0);
 		mch_enable_flush();
 	    }
 	    else if (redraw_cmdline || clear_cmdline)