1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 159e027793..54459792aa 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -4365,10 +4365,15 @@ void ex_help(exarg_T *eap)
       ) {
     if (cmdmod.tab != 0)
       wp = NULL;
-    else
-      for (wp = firstwin; wp != NULL; wp = wp->w_next)
-        if (wp->w_buffer != NULL && wp->w_buffer->b_help)
+    else {
+      wp = NULL;
+      FOR_ALL_WINDOWS_IN_TAB(wp2, curtab) {
+        if (wp2->w_buffer != NULL && wp2->w_buffer->b_help) {
+          wp = wp2;
           break;
+        }
+      }
+    }
     if (wp != NULL && wp->w_buffer->b_nwindows > 0)
       win_enter(wp, true);
     else {