3 files changed, 41 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim
index d2e42720d2..b7f41a711b 100644
--- a/src/nvim/testdir/test_window_cmd.vim
+++ b/src/nvim/testdir/test_window_cmd.vim
@@ -34,4 +34,37 @@ func Test_window_cmd_cmdwin_with_vsp()
   set ls&vim
 endfunc
 
+function Test_window_cmd_wincmd_gf()
+  let fname = 'test_gf.txt'
+  let swp_fname = '.' . fname . '.swp'
+  call writefile([], fname)
+  call writefile([], swp_fname)
+  function s:swap_exists()
+    let v:swapchoice = s:swap_choice
+  endfunc
+  augroup test_window_cmd_wincmd_gf
+    autocmd!
+    exec "autocmd SwapExists " . fname . " call s:swap_exists()"
+  augroup END
+
+  call setline(1, fname)
+  " (E)dit anyway
+  let s:swap_choice = 'e'
+  wincmd gf
+  call assert_equal(2, tabpagenr())
+  call assert_equal(fname, bufname("%"))
+  quit!
+
+  " (Q)uit
+  let s:swap_choice = 'q'
+  wincmd gf
+  call assert_equal(1, tabpagenr())
+  call assert_notequal(fname, bufname("%"))
+  new | only!
+
+  call delete(fname)
+  call delete(swp_fname)
+  augroup! test_window_cmd_wincmd_gf
+endfunc
+
 " vim: sw=2 et
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b60cecf7f9..431c92d436 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -486,7 +486,7 @@ static int included_patches[] = {
   // 1959 NA
   // 1958 NA
   // 1957 NA
-  // 1956,
+  1956,
   // 1955,
   // 1954,
   // 1953,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index dac3c1614a..3e7aed7867 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -385,12 +385,16 @@ wingotofile:
 
     ptr = grab_file_name(Prenum1, &lnum);
     if (ptr != NULL) {
+      tabpage_T *oldtab = curtab;
+      win_T *oldwin = curwin;
       setpcmark();
       if (win_split(0, 0) == OK) {
         RESET_BINDING(curwin);
-        (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL,
-            ECMD_HIDE, NULL);
-        if (nchar == 'F' && lnum >= 0) {
+        if (do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE, NULL) == FAIL) {
+          // Failed to open the file, close the window opened for it.
+          win_close(curwin, false);
+          goto_tabpage_win(oldtab, oldwin);
+        } else if (nchar == 'F' && lnum >= 0) {
           curwin->w_cursor.lnum = lnum;
           check_cursor_lnum();
           beginline(BL_SOL | BL_FIX);