1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 1e1fbe7a4d..6f636f643a 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -699,11 +699,12 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
         }
 
         prev_matchid = matchid;
-        do {
+
+        while (prev_matchid == matchid && *ptr != NUL) {
           incr();
           ptr += utfc_ptr2len(ptr);
           matchid = syn_get_concealed_id(wp, lnum, (colnr_T)(ptr - line));
-        } while (prev_matchid == matchid);
+        }
 
         continue;
       }