1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 6b6c51d836..9899da78c9 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3048,6 +3048,12 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
             && (wp->w_p_list && lcs_eol_one == -1)) {
           search_attr = 0;
         }
+
+        // Do not allow a conceal over EOL otherwise EOL will be missed
+        // and bad things happen.
+        if (*ptr == NUL) {
+          has_match_conc = 0;
+        }
       }
 
       if (diff_hlf != (hlf_T)0) {