diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index e5e1f65..6480377 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2287,6 +2287,8 @@
 		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)