1 files changed, 10 insertions, 0 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index c7f7b569e7..ae4372da89 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -6157,6 +6157,16 @@ static void nv_g_cmd(cmdarg_T *cap)
       i = curwin->w_leftcol + curwin->w_width_inner - col_off - 1;
       coladvance((colnr_T)i);
 
+      // if the character doesn't fit move one back
+      if (curwin->w_cursor.col > 0 && utf_ptr2cells((const char *)get_cursor_pos_ptr()) > 1) {
+        colnr_T vcol;
+
+        getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &vcol);
+        if (vcol >= curwin->w_leftcol + curwin->w_width - col_off) {
+          curwin->w_cursor.col--;
+        }
+      }
+
       // Make sure we stick in this column.
       validate_virtcol();
       curwin->w_curswant = curwin->w_virtcol;