diff --git a/share/config.fish b/share/config.fish
index 4d6e59645..194c0e8dc 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -166,13 +166,11 @@ if status --is-login
 
             # Populate path according to config files
             for path_file in $argv[2] $argv[3]/*
-                if test -f $path_file
-                    while read -l entry
-                        if not contains -- $entry $result
-                            test -n "$entry"
-                            and set -a result $entry
-                        end
-                    end <$path_file
+                for entry in (string split : <? $path_file)
+                    if not contains -- $entry $result
+                        test -n "$entry"
+                        and set -a result $entry
+                    end
                 end
             end