1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index f3bb3d8c73..bbe80a519c 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -1058,6 +1058,11 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he
     if (col >= (colnr_T)wp->w_width) {
       col -= wp->w_width;
       numberextra = wp->w_width - (numberextra - win_col_off2(wp));
+      if (*p_sbr != NUL) {
+        colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr);
+        if (col >= sbrlen)
+          col -= sbrlen;
+      }
       if (numberextra > 0) {
         col = col % numberextra;
       }