diff --git a/share/fish.in b/share/fish.in
index 09d2961c8..1e33f1f5c 100644
--- a/share/fish.in
+++ b/share/fish.in
@@ -18,7 +18,8 @@ if test "$USER" = root
 end
 
 for i in $path_list
-	if not expr "$PATH" : "$i/*" >/dev/null
+	set -l regex "^$i\(\|/*\)\$"
+	if not  printf "%s\n" $PATH|grep $regex >/dev/null
 		if test -d $i
 			set PATH $PATH $i
 		end