diff --git a/src/normal.c b/src/normal.c
index d1be629..f5b7651 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -6564,6 +6564,12 @@
 	clearopbeep(cap->oap);
     else
     {
+	/* Don't leave the cursor on the NUL past a line */
+	if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
+	{
+	    --curwin->w_cursor.col;
+	    cap->oap->inclusive = TRUE;
+	}
 #ifdef FEAT_VIRTUALEDIT
 	curwin->w_cursor.coladd = 0;
 #endif