diff --git a/src/edit.c b/src/edit.c
index dbfa0ae5f9929..a8e695c91c49e 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -4183,7 +4183,7 @@ ins_bs(
 #endif
 
 	    // delete characters until we are at or before want_vcol
-	    while (vcol > want_vcol
+	    while (vcol > want_vcol && curwin->w_cursor.col > 0
 		    && (cc = *(ml_get_cursor() - 1), VIM_ISWHITE(cc)))
 		ins_bs_one(&vcol);
 
diff --git a/src/version.c b/src/version.c
index 9fba35bea0676..cf2e77d9fb791 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5162,
 /**/
     5161,
 /**/