1 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 12efddc205..18e09a7619 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1861,11 +1861,17 @@ void ex_argdelete(exarg_T *eap)
       } else if (curwin->w_arg_idx > eap->line1) {
         curwin->w_arg_idx = (int)eap->line1;
       }
+      if (ARGCOUNT == 0) {
+          curwin->w_arg_idx = 0;
+      } else if (curwin->w_arg_idx >= ARGCOUNT) {
+          curwin->w_arg_idx = ARGCOUNT - 1;
+      }
     }
-  } else if (*eap->arg == NUL)
+  } else if (*eap->arg == NUL) {
     EMSG(_(e_argreq));
-  else
+  } else {
     do_arglist(eap->arg, AL_DEL, 0);
+  }
   maketitle();
 }