diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index 31193dfa..f3e64f0b 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -116,7 +116,7 @@ function! s:get_buffer_list()
   endfor
 
   " TODO: temporary fix; force the active buffer to be first when there are many buffers open
-  if len(buffers) > s:buf_max
+  if len(buffers) > s:buf_max && index(buffers, cur) > -1
     while buffers[0] != cur
       let first = remove(buffers, 0)
       call add(buffers, first)