diff --git a/src/screen.c b/src/screen.c
index eb1b1df..661da03 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3369,8 +3369,8 @@
     /* Cursor line highlighting for 'cursorline' in the current window.  Not
      * when Visual mode is active, because it's not clear what is selected
      * then. */
-    if (wp->w_p_cul && wp == curwin && lnum == wp->w_cursor.lnum
-							    && !VIsual_active)
+    if (wp->w_p_cul && lnum == wp->w_cursor.lnum
+					 && !(wp == curwin  && VIsual_active))
     {
 	line_attr = hl_attr(HLF_CUL);
 	area_highlighting = TRUE;
@@ -3543,7 +3543,7 @@
 		     * the current line differently.
 		     * TODO: Can we use CursorLine instead of CursorLineNr
 		     * when CursorLineNr isn't set? */
-		    if (((wp->w_p_cul && wp == curwin) || wp->w_p_rnu)
+		    if ((wp->w_p_cul || wp->w_p_rnu)
 						 && lnum == wp->w_cursor.lnum)
 			char_attr = hl_attr(HLF_CLN);
 #endif
@@ -3586,8 +3586,7 @@
 			tocol += n_extra;
 #ifdef FEAT_SYN_HL
 		    /* combine 'showbreak' with 'cursorline' */
-		    if (wp->w_p_cul && wp == curwin
-						 && lnum == wp->w_cursor.lnum)
+		    if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
 			char_attr = hl_combine_attr(char_attr, HLF_CLN);
 #endif
 		}