diff --git a/autoload/airline/util.vim b/autoload/airline/util.vim
index 93851fb0..bb0a1d2b 100644
--- a/autoload/airline/util.vim
+++ b/autoload/airline/util.vim
@@ -18,7 +18,9 @@ let s:focusgained_ignore_time = 0
 " actually changed.
 function! airline#util#winwidth(...) abort
   let nr = get(a:000, 0, 0)
-  if get(g:, 'airline_statusline_ontop', 0)
+  " When statusline is on top, or using global statusline for Neovim
+  " always return the number of columns
+  if get(g:, 'airline_statusline_ontop', 0) || &laststatus > 2
     return &columns
   else
     return winwidth(nr)