diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 4e24993..3a78d34 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -3007,8 +3007,13 @@ function! s:JumpToTag(stay_in_tagbar) abort
         call s:goto_win(tagbarwinnr)
         redraw
     elseif g:tagbar_autoclose || autoclose
+        " Also closes preview window
         call s:CloseWindow()
     else
+        " Close the preview window if it was opened by us
+        if s:pwin_by_tagbar
+            pclose
+        endif
         call s:HighlightTag(0)
     endif
 endfunction
diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index b3a0d67..86f8a92 100644
--- a/doc/tagbar.txt
+++ b/doc/tagbar.txt
@@ -1408,6 +1408,7 @@ Michael McClimon
 Seth Milliken
 Kien N
 Darcy Parker
+fritzophrenic
 pielgrzym
 Taybin Rutkin
 Kian Ryan