diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 5ace4b8..a598849 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -1917,7 +1917,8 @@ function! s:OpenWindow(flags) abort
             " then that means that the window numbers have changed.
             " Just jump back to the previous window since we won't be able to
             " restore the window history.
-            if winnr() == pprevwinnr || winnr() == prevwinnr
+            if winnr() == prevwinnr
+             \ || (exists('pprevwinnr') && winnr() == pprevwinnr)
                 call s:goto_win('p')
             else
                 if exists('pprevwinnr')