diff --git a/plugin/airline.vim b/plugin/airline.vim
index 33dc6058..dec8dd2f 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -91,7 +91,7 @@ function! s:airline_toggle()
             \ call <sid>on_window_changed()
 
       autocmd VimResized * call <sid>airline_refresh()
-      autocmd TabEnter * :unlet! w:airline_lastmode
+      autocmd TabEnter * :unlet! w:airline_lastmode w:airline_active
       autocmd BufWritePost */autoload/airline/themes/*.vim
             \ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
             \ | call airline#load_theme()