diff --git a/src/arglist.c b/src/arglist.c
index a63f6c7..d28b31d 100644
--- a/src/arglist.c
+++ b/src/arglist.c
@@ -983,6 +983,9 @@
 
     if (aall->had_tab > 0)
 	goto_tabpage_tp(first_tabpage, TRUE, TRUE);
+
+    // moving tabpages around in an autocommand may cause an endless loop
+    tabpage_move_disallowed++;
     for (;;)
     {
 	tpnext = curtab->tp_next;
@@ -1093,6 +1096,7 @@
 
 	goto_tabpage_tp(tpnext, TRUE, TRUE);
     }
+    tabpage_move_disallowed--;
 }
 
 /*