diff --git a/cli/fish/config.fish b/cli/fish/config.fish
index f0c72e5..64af807 100644
--- a/cli/fish/config.fish
+++ b/cli/fish/config.fish
@@ -88,7 +88,8 @@ if status is-interactive
             if string match -q '#*' $line
                 continue
             end
-            eval export $line
+            set pair (string split -m 1 '=' -- $line)
+            eval "set -gx $pair[1] \"$pair[2]\""
         end < $argv[1]
     end
 
@@ -97,5 +98,6 @@ if status is-interactive
             loadenv .env
        end
     end
+    readenv
 end