diff --git a/autoload/airline/extensions/tabline/buffers.vim b/autoload/airline/extensions/tabline/buffers.vim
index 75cca574..35b9e98f 100644
--- a/autoload/airline/extensions/tabline/buffers.vim
+++ b/autoload/airline/extensions/tabline/buffers.vim
@@ -35,9 +35,8 @@ endfunction
 function! airline#extensions#tabline#buffers#on()
   augroup airline_tabline_buffers
     autocmd!
-    autocmd BufDelete * call airline#extensions#tabline#buffers#invalidate()
-    autocmd User BufMRUChange call airline#extensions#tabline#buflist#invalidate()
-    autocmd User BufMRUChange call airline#extensions#tabline#buffers#invalidate()
+    autocmd BufDelete * call airline#extensions#tabline#buflist#clean()
+    autocmd User BufMRUChange call airline#extensions#tabline#buflist#clean()
   augroup END
 endfunction
 
diff --git a/autoload/airline/extensions/tabline/buflist.vim b/autoload/airline/extensions/tabline/buflist.vim
index 72477e7a..c07cf867 100644
--- a/autoload/airline/extensions/tabline/buflist.vim
+++ b/autoload/airline/extensions/tabline/buflist.vim
@@ -7,6 +7,11 @@ function! airline#extensions#tabline#buflist#invalidate()
   unlet! s:current_buffer_list
 endfunction
 
+function! airline#extensions#tabline#buflist#clean()
+  call airline#extensions#tabline#buflist#invalidate()
+  call airline#extensions#tabline#buffers#invalidate()
+endfunction
+
 " paths in excludes list
 function! s:ExcludePaths(nr, exclude_paths)
   let bpath = fnamemodify(bufname(a:nr), ":p")