diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index cfbd3e9a8e..fc6d188f8a 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -5613,7 +5613,7 @@ static void ex_tabs(exarg_T *eap)
     FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
       if (got_int) {
         break;
-      } else if (!wp->w_config.focusable) {
+      } else if (!wp->w_config.focusable || wp->w_config.hide) {
         continue;
       }
 
diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c
index 5b98954875..19341b05c8 100644
--- a/src/nvim/statusline.c
+++ b/src/nvim/statusline.c
@@ -710,7 +710,7 @@ void draw_tabline(void)
       bool modified = false;
 
       for (wincount = 0; wp != NULL; wp = wp->w_next, wincount++) {
-        if (!wp->w_config.focusable) {
+        if (!wp->w_config.focusable || wp->w_config.hide) {
           wincount--;
         } else if (bufIsChanged(wp->w_buffer)) {
           modified = true;
diff --git a/test/functional/ui/cmdline2_spec.lua b/test/functional/ui/cmdline2_spec.lua
index 928c5bfda0..ce3187f4f6 100644
--- a/test/functional/ui/cmdline2_spec.lua
+++ b/test/functional/ui/cmdline2_spec.lua
@@ -23,7 +23,7 @@ describe('cmdline2', function()
     exec('tabnew | tabprev')
     feed(':set ch=0')
     screen:expect([[
-      {5: }{100:2}{5: [No Name] }{24: [No Name] }{2:                            }{24:X}|
+      {5: [No Name] }{24: [No Name] }{2:                              }{24:X}|
                                                            |
       {1:~                                                    }|*11
       {16::}{15:set} {16:ch}{15:=}0^                                            |
@@ -31,14 +31,14 @@ describe('cmdline2', function()
     feed('<CR>')
     exec('tabnext')
     screen:expect([[
-      {24: [No Name] }{5: }{100:2}{5: [No Name] }{2:                            }{24:X}|
+      {24: [No Name] }{5: [No Name] }{2:                              }{24:X}|
       ^                                                     |
       {1:~                                                    }|*11
       {16::}{15:set} {16:ch}{15:=}0                                            |
     ]])
     exec('tabnext')
     screen:expect([[
-      {5: }{100:2}{5: [No Name] }{24: [No Name] }{2:                            }{24:X}|
+      {5: [No Name] }{24: [No Name] }{2:                              }{24:X}|
       ^                                                     |
       {1:~                                                    }|*12
     ]])