diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index 819fc1804..6e4fc7a7f 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -69,8 +69,8 @@ function __fish_complete_man
 
         # Fish commands are not given by apropos
         if not set -ql exclude_fish_commands
-            set -l files $__fish_data_dir/man/man1/*.1
-            string replace -r '.*/([^/]+)\.1$' '$1\t1: fish command' -- $files (status list-files man/man1/ 2>/dev/null)
+            set -l files $__fish_data_dir/man/man1/*.1*
+            string replace -r '.*/([^/]+)\.1(\.gz)?$' '$1\t1: fish command' -- $files (status list-files man/man1/ 2>/dev/null)
         end
     else
         return 1