diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index efdbe6c..b38b6d9 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -867,8 +867,7 @@ function! s:CloseWindow() abort
     call s:ShrinkIfExpanded()
 
     if s:autocommands_done && !s:statusline_in_use
-        autocmd! TagbarAutoCmds
-        let s:autocommands_done = 0
+        call tagbar#StopAutoUpdate()
     endif
 
     call tagbar#debug#log('CloseWindow finished')
@@ -3248,6 +3247,11 @@ function! tagbar#RestoreSession() abort
     call s:RestoreSession()
 endfunction
 
+function! tagbar#StopAutoUpdate() abort
+    autocmd! TagbarAutoCmds
+    let s:autocommands_done = 0
+endfunction
+
 " }}}2
 
 " tagbar#toggle_pause() {{{2
diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index 0efcf37..22de2b7 100644
--- a/doc/tagbar.txt
+++ b/doc/tagbar.txt
@@ -306,6 +306,15 @@ COMMANDS                                                     *tagbar-commands*
 :TagbarDebugEnd                                              *:TagbarDebugEnd*
     End debug mode, debug messages will no longer be written to the logfile.
 
+
+------------------------------------------------------------------------------
+FUNCTIONS                                                   *tagbar-functions*
+
+*tagbar#StopAutoUpdate()*
+    Remove autocommands that might have been installed to automatically
+    update tag information.  This should be called after you have used
+    |tagbar#currenttag| manually.
+
 ------------------------------------------------------------------------------
 KEY MAPPINGS                                                     *tagbar-keys*
 
@@ -867,6 +876,10 @@ Note that if there is an error when processing the current file no error
 message will be shown in order to not disrupt the statusline. If the function
 doesn't seem to work right open the Tagbar window to see any error messages.
 
+Note you should call |tagbar#StopAutoUpdate| manually in case you do not want
+to display the current tag anymore.  Otherwise the autocommands to update the
+state are being executed all the time still.
+
 ------------------------------------------------------------------------------
 IGNORING SPECIFIC FILES                                        *tagbar-ignore*