diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index e5e1f65c6..6480377b7 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2287,6 +2287,8 @@ ex_listdo(eap)
 		if (!win_valid(wp))
 		    break;
 		win_goto(wp);
+		if (curwin != wp)
+		    break;  /* something must be wrong */
 		wp = curwin->w_next;
 	    }
 	    else if (eap->cmdidx == CMD_tabdo)
diff --git a/src/version.c b/src/version.c
index 66893a20c..90ba544cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    241,
 /**/
     240,
 /**/