diff --git a/autoload/airline.vim b/autoload/airline.vim
index d8b9ae1..d47a950 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -1,5 +1,6 @@
 " vim: ts=2 sts=2 sw=2 fdm=indent
 let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
+let s:lastmode = ''
 
 let s:airline_highlight_map = {
       \ 'mode'           : 'Al2',
@@ -31,7 +32,8 @@ function! airline#load_theme(name)
   let g:airline_theme = a:name
   let inactive_colors = g:airline#themes#{g:airline_theme}#inactive "also lazy loads the theme
   call airline#highlight(['inactive'], '_inactive')
-  call airline#highlight(['normal'])
+  let s:lastmode = ''
+  call airline#update_highlight()
 endfunction
 
 function! airline#highlight(modes, ...)
@@ -143,7 +145,6 @@ function! airline#update_statusline(active)
   call setwinvar(winnr(), '&statusline', sl)
 endfunction
 
-let s:lastmode = ''
 let g:airline_current_mode_text = ''
 function! airline#update_highlight()
   let l:m = mode()
diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 7130d06..076797a 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -28,7 +28,7 @@ function! airline#extensions#apply_window_overrides()
   elseif &ft == 'diff'
     call s:override_left_only('diff', '')
   elseif &ft == 'tagbar'
-    call s:override_left_only('tagbar', '')
+    call s:override_left_only('Tagbar', '')
   elseif &ft == 'minibufexpl'
     call s:override_left_only('MiniBufExplorer', '')
   endif