diff --git a/share/functions/__fish_print_commands.fish b/share/functions/__fish_print_commands.fish
index e55bb8aa1..19a393571 100644
--- a/share/functions/__fish_print_commands.fish
+++ b/share/functions/__fish_print_commands.fish
@@ -3,7 +3,7 @@ function __fish_print_commands --description "Print a list of documented fish co
         for file in $__fish_data_dir/man/man1/**.1*
             string replace -r '.*/' '' -- $file |
                 string replace -r '.1(.gz)?$' '' |
-                string match -rv '^fish-(?:completions|doc|tutorial|faq)$'
+                string match -rv '^fish-(?:changelog|completions|doc|tutorial|faq|for-bash-users|interactive|language|releasenotes)$'
         end
     end
 end
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 29b3f054f..dabaea6e8 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -128,11 +128,6 @@ function help --description 'Show help for the fish shell'
             set fish_help_page "cmds/source.html"
         case globbing
             set fish_help_page "language.html#expand"
-        case (builtin -n) (__fish_print_commands)
-            # If the docs aren't installed, __fish_print_commands won't print anything
-            # Since we document all our builtins, check those at least.
-            # The alternative is to create this list at build time.
-            set fish_help_page "cmds/$fish_help_item.html"
         case 'completion-*'
             set fish_help_page "completions.html#$fish_help_item"
         case 'tut-*'
@@ -159,6 +154,11 @@ function help --description 'Show help for the fish shell'
             set fish_help_page "interactive.html#$fish_help_item"
         case $tutpages
             set fish_help_page "tutorial.html#$fish_help_item"
+        case (builtin -n) (__fish_print_commands)
+            # If the docs aren't installed, __fish_print_commands won't print anything
+            # Since we document all our builtins, check those at least.
+            # The alternative is to create this list at build time.
+            set fish_help_page "cmds/$fish_help_item.html"
         case ''
             set fish_help_page "index.html"
         case "*"