diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index ea76267b..b862475e 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -190,9 +190,11 @@ function! airline#extensions#tabline#title(n)
     let buflist = tabpagebuflist(a:n)
     let winnr = tabpagewinnr(a:n)
     let all_buffers = airline#extensions#tabline#buflist#list()
-    return airline#extensions#tabline#get_buffer_name(
-          \ buflist[winnr - 1],
-          \ filter(buflist, 'index(all_buffers, v:val) != -1'))
+    let curbuf = filter(buflist, 'index(all_buffers, v:val) != -1')
+    if len(curbuf) ==  0
+      call add(curbuf, tabpagebuflist()[0])
+    endif
+    return airline#extensions#tabline#get_buffer_name(curbuf[0], curbuf)
   endif
 
   return title