diff --git a/share/completions/isatty.fish b/share/completions/isatty.fish
index 2ee644b0f..1e65bf77c 100644
--- a/share/completions/isatty.fish
+++ b/share/completions/isatty.fish
@@ -1 +1,9 @@
-complete -c isatty -x -k -a "stdin stdout stderr"
+complete -c isatty -x
+
+if test -d /dev/fd
+    complete -c isatty -k -a "(string replace /dev/fd/ '' /dev/fd/*)"
+end
+
+complete -c isatty -k -a "stderr" -d "2"
+complete -c isatty -k -a "stdout" -d "1"
+complete -c isatty -k -a "stdin" -d "0"