diff --git a/plugin/airline.vim b/plugin/airline.vim
index 2fcbd450..1c13380d 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -41,7 +41,7 @@ function! s:on_window_changed()
   " different autocommands.
   let l:key = [bufnr('%'), winnr(), winnr('$')]
   if get(t:, 'airline_last_window_changed', []) == l:key
-        \ && &stl =~? 'airline#statusline(\d\+)$'
+        \ && &stl is# '%!airline#statusline('.winnr().')'
     return
   endif
   let t:airline_last_window_changed = l:key
@@ -87,7 +87,7 @@ function! s:airline_toggle()
       autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
 
       autocmd GUIEnter,ColorScheme * call <sid>on_colorscheme_changed()
-      autocmd VimEnter,WinEnter,BufWinEnter,FileType,BufUnload *
+      autocmd SessionLoadPost,VimEnter,WinEnter,BufWinEnter,FileType,BufUnload *
             \ call <sid>on_window_changed()
 
       autocmd VimResized * call <sid>airline_refresh()