diff --git a/autoload/airline.vim b/autoload/airline.vim
index e9355922..688dbf76 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -78,6 +78,7 @@ endfunction
 
 function! airline#update_statusline(active)
   if s:is_excluded_window()
+    call setwinvar(winnr(), '&statusline', '')
     return
   endif
 
diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 45f67520..1f6c81dc 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -4,6 +4,7 @@ function! airline#extensions#load()
         \ let w:airline_section_a = 'Unite'
         \ | let w:airline_section_b = unite#get_status_string()
         \ | call airline#update_statusline(1)
+        \ | unlet w:airline_section_a | unlet w:airline_section_b
 
   if exists('g:loaded_ctrlp') && g:loaded_ctrlp
     call airline#extensions#ctrlp#load_ctrlp_hi()
diff --git a/plugin/airline.vim b/plugin/airline.vim
index df71ad85..a70e6e9e 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -50,5 +50,5 @@ augroup airline
   au!
   autocmd ColorScheme * call airline#highlight(['normal'])
   autocmd WinLeave * call airline#update_statusline(0)
-  autocmd WinEnter,BufWinEnter * call <sid>init() | call airline#update_statusline(1)
+  autocmd WinEnter,BufWinEnter,FileType * call <sid>init() | call airline#update_statusline(1)
 augroup END