diff --git a/src/drawline.c b/src/drawline.c
index b1210b7..b4efbcb 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2783,6 +2783,7 @@
 	// Show "extends" character from 'listchars' if beyond the line end and
 	// 'list' is set.
 	if (wp->w_lcs_chars.ext != NUL
+		&& draw_state == WL_LINE
 		&& wp->w_p_list
 		&& !wp->w_p_wrap
 #ifdef FEAT_DIFF
@@ -3050,7 +3051,8 @@
 	    wp->w_p_rl ? (col < 0) :
 #endif
 				    (col >= wp->w_width))
-		&& (*ptr != NUL
+		&& (draw_state != WL_LINE
+		    || *ptr != NUL
 #ifdef FEAT_DIFF
 		    || filler_todo > 0
 #endif