diff --git a/autoload/airline.vim b/autoload/airline.vim
index dfc93e0e..817c5e0d 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -55,6 +55,8 @@ function! s:is_excluded_window()
 endfunction
 
 function! s:apply_window_overrides()
+  call airline#extensions#clear_window_overrides()
+
   if &buftype == 'quickfix'
     let w:airline_section_a = 'Quickfix'
     let w:airline_section_b = ''
diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index a335db01..7130d06a 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -7,12 +7,14 @@ function! s:override_left_only(section1, section2)
   let w:airline_left_only = 1
 endfunction
 
-function! airline#extensions#apply_window_overrides()
+function! airline#extensions#clear_window_overrides()
   silent! unlet w:airline_left_only
   for section in s:sections
     silent! unlet w:airline_section_{section}
   endfor
+endfunction
 
+function! airline#extensions#apply_window_overrides()
   if &ft == 'netrw'
     call s:override_left_only('netrw', '%f')
   elseif &ft == 'unite'