diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 86d06dc..d32d739 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -2411,13 +2411,13 @@ function! s:RenderContent(...) abort
         let in_tagbar = 1
     else
         let in_tagbar = 0
-        let currwinnr = winnr()
+        let prevwinnr = winnr()
 
         " Get the previous window number, so that we can reproduce
         " the window entering history later. Do not run autocmd on
         " this command, make sure nothing is interfering.
-        call s:winexec('noautocmd wincmd p')
-        let prevwinnr = winnr()
+        call s:winexec('wincmd p')
+        let pprevwinnr = winnr()
 
         call s:winexec(tagbarwinnr . 'wincmd w')
     endif
@@ -2482,8 +2482,8 @@ function! s:RenderContent(...) abort
     let &eventignore = eventignore_save
 
     if !in_tagbar
+        call s:winexec(pprevwinnr . 'wincmd w')
         call s:winexec(prevwinnr . 'wincmd w')
-        call s:winexec(currwinnr . 'wincmd w')
     endif
 endfunction