diff --git a/share/functions/_.fish b/share/functions/_.fish
index c5a180890..fcfd75db5 100644
--- a/share/functions/_.fish
+++ b/share/functions/_.fish
@@ -1,15 +1,13 @@
-
 #
 # Alias for gettext (or a fallback if gettext isn't installed)
 #
-
-set -l path (which gettext ^/dev/null)
-if test -x (echo $path)
+set -l gettext_path (command -v gettext)
+if test -e (echo -n $gettext_path)
 	function _ --description "Alias for the gettext command"
-		gettext fish $argv
+		command gettext fish $argv
 	end
 else
-	function _ --description "Alias for the gettext command"
+	function _ --description "Fallback alias for the gettext command"
 		echo -n $argv
 	end
 end