diff --git a/cli/fish/config.fish b/cli/fish/config.fish
index 64af807..71a6f47 100644
--- a/cli/fish/config.fish
+++ b/cli/fish/config.fish
@@ -89,7 +89,11 @@ if status is-interactive
                 continue
             end
             set pair (string split -m 1 '=' -- $line)
-            eval "set -gx $pair[1] \"$pair[2]\""
+            if string match -q "'*" $pair[2]; or string match -q '"*' $pair[2]
+                eval "set -gx $pair[1] $pair[2]"
+            else
+                eval "set -gx $pair[1] \"$pair[2]\""
+            end
         end < $argv[1]
     end