diff --git a/plugin/airline.vim b/plugin/airline.vim
index cb13c3b..0fcf55c 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -27,7 +27,8 @@ function! s:init()
 endfunction
 
 function! s:on_window_changed()
-  if pumvisible()
+  if pumvisible() && (!&previewwindow ||
+        \ (g:airline_exclude_preview && &previewwindow))
     return
   endif
   call s:init()