diff --git a/autoload/xolox/session.vim b/autoload/xolox/session.vim
index 6688d61..28284a8 100644
--- a/autoload/xolox/session.vim
+++ b/autoload/xolox/session.vim
@@ -246,6 +246,9 @@ function! s:state_filter(line) " {{{3
   elseif a:line =~ '^file .\{-}__Tag_List__$'
     " Same trick (about the E95) for TagList.
     return '" ' . a:line
+  elseif a:line =~ '^file .\{-}__Tagbar__$'
+    " Same trick (about the E95) for Tagbar.
+    return '" ' . a:line
   elseif a:line =~ "^\\s*silent exe 'bwipe ' \\. s:wipebuf$" || a:line =~ '^unlet! s:wipebuf$'
     " Disable Vim's special handling of the initial, empty buffer because it
     " breaks restoring of special windows with content generated by a Vim
@@ -315,6 +318,9 @@ function! s:check_special_window(session)
   elseif bufname == '__Tag_List__'
     let command = 'Tlist'
     let argument = ''
+  elseif bufname == '__Tagbar__'
+    let command = 'TagbarOpen'
+    let argument = ''
   elseif exists('g:proj_running') && g:proj_running == bufnr('%')
     let command = 'Project'
     let argument = expand('%:p')