diff --git a/share/completions/type.fish b/share/completions/type.fish
index 5a40e8008..d50760a02 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -8,5 +8,5 @@ complete -c type -s P -l force-path -d (N_ "Print path to command")
 
 complete -c type -a "(builtin -n)" -d (N_ "Builtin")
 complete -c type -a "(functions -n)" -d (N_ "Function")
-complete -c type -a "(__fish_complete_command)" -d (N_ "Command")
 
+complete -c type -a "(commandline -ct)(complete -C(commandline -ct))" -x
diff --git a/share/completions/which.fish b/share/completions/which.fish
index 4d8883883..16c1b7c4d 100644
--- a/share/completions/which.fish
+++ b/share/completions/which.fish
@@ -12,4 +12,4 @@ complete -c which -l tty-only -d (N_ "Stop processing options on the right if no
 complete -c which -s v -s V -l version -d (N_ "Display version and exit")
 complete -c which -l help -d (N_ "Display help and exit")
 
-complete -c which -a "(__fish_complete_command)" -d "Command" -x
+complete -c which -a "(commandline -ct)(complete -C(commandline -ct))" -x