diff --git a/src/if_py_both.h b/src/if_py_both.h
index bf5ea4cf38..5044afbeff 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -4196,7 +4196,9 @@ SetBufferLineList(
 		    break;
 		}
 	    }
-	    if (buf == curbuf)
+	    if (buf == curbuf && (save_curwin != NULL || save_curbuf == NULL))
+		/* Using an existing window for the buffer, adjust the cursor
+		 * position. */
 		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
 	    if (save_curbuf == NULL)
 		/* Only adjust marks if we managed to switch to a window that
diff --git a/src/version.c b/src/version.c
index d8ed2a03a0..a3e113961f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    424,
 /**/
     423,
 /**/