1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index ea43b93b30..9c9be4aa02 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1410,6 +1410,12 @@ static void read_stdin(void)
   int save_msg_didany = msg_didany;
   set_buflisted(true);
   (void)open_buffer(true, NULL, 0);  // create memfile and read file
+  if (BUFEMPTY() && curbuf->b_next != NULL) {
+    // stdin was empty, go to buffer 2 (e.g. "echo file1 | xargs nvim"). #8561
+    msg_silent++;
+    do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, curbuf->b_next->handle, 0);
+    msg_silent--;
+  }
   no_wait_return = false;
   msg_didany = save_msg_didany;
   TIME_MSG("reading stdin");