diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index 43415e714..80df7c92f 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -64,6 +64,10 @@ function __fish_complete_man
 		  print name, sect
 		}
 		'
+        
+        # Fish commands are not given by apropos
+        set -l files $__fish_datadir/man/man1/*.1
+        string replace -r '.*/([^/]+)\.1$' '$1\tFish command' -- $files
     else
         return 1
     end