4 files changed, 29 insertions, 3 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 59f4c1e968..2c70f396a1 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -919,7 +919,8 @@ end_do_tag:
   /* Only store the new index when using the tagstack and it's valid. */
   if (use_tagstack && tagstackidx <= curwin->w_tagstacklen)
     curwin->w_tagstackidx = tagstackidx;
-  postponed_split = 0;          /* don't split next time */
+  postponed_split = 0;          // don't split next time
+  g_do_tagpreview = 0;          // don't do tag preview next time
 
   return jumped_to_tag;
 }
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 5299fec7c2..0403a53f9c 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -95,8 +95,17 @@ function RunTheTest(test)
   endif
 
   " Close any extra windows and make the current one not modified.
-  while winnr('$') > 1
+  while 1
+    let wincount = winnr('$')
+    if wincount == 1
+      break
+    endif
     bwipe!
+    if wincount == winnr('$')
+      " Did not manage to close a window.
+      only!
+      break
+    endif
   endwhile
   set nomodified
 endfunc
diff --git a/src/nvim/testdir/test_tagjump.vim b/src/nvim/testdir/test_tagjump.vim
index b22bde8047..678ad0ada8 100644
--- a/src/nvim/testdir/test_tagjump.vim
+++ b/src/nvim/testdir/test_tagjump.vim
@@ -7,4 +7,20 @@ func Test_ptag_with_notagstack()
   set tagstack&vim
 endfunc
 
+func Test_cancel_ptjump()
+  set tags=Xtags
+  call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//",
+        \ "word\tfile1\tcmd1",
+        \ "word\tfile2\tcmd2"],
+        \ 'Xtags')
+
+  only!
+  call feedkeys(":ptjump word\<CR>\<CR>", "xt")
+  help
+  call assert_equal(2, winnr('$'))
+
+  call delete('Xtags')
+  quit
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4758e35f01..ab3ccdab3d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -193,7 +193,7 @@ static int included_patches[] = {
   2251,
   // 2250,
   2249,
-  // 2248,
+  2248,
   // 2247 NA
   // 2246,
   // 2245,