diff --git a/src/drawline.c b/src/drawline.c
index 018a6d8..4bda102 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -343,9 +343,8 @@
 	int		num_attr UNUSED)
 {
     if ((wp->w_p_nu || wp->w_p_rnu)
-	    && ((wlv->row == wlv->startrow + wlv->filler_lines
-		    && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow))
-		|| vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
+	     && (wlv->row == wlv->startrow + wlv->filler_lines
+			 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
     {
 #ifdef FEAT_SIGNS
 	// If 'signcolumn' is set to 'number' and a sign is present
@@ -363,7 +362,7 @@
 #ifdef FEAT_PROP_POPUP
 		  + wlv->text_prop_above_count
 #endif
-		  )
+		    && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow))
 	  {
 	      long num;
 	      char *fmt = "%*ld ";