diff --git a/src/if_python.c b/src/if_python.c
index adcb52d..0e06d36 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -2410,6 +2410,8 @@
 	    curwin->w_cursor.lnum = lo;
 	    check_cursor();
 	}
+	else
+	    check_cursor_col();
 	changed_cline_bef_curs();
     }
     invalidate_botline();
@@ -2487,6 +2489,10 @@
 
 	curbuf = savebuf;
 
+	/* Check that the cursor is not beyond the end of the line now. */
+	if (buf == curwin->w_buffer)
+	    check_cursor_col();
+
 	if (PyErr_Occurred() || VimErrorCheck())
 	    return FAIL;