diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index adf951d5f..4b671a808 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -60,13 +60,13 @@ function fish_config --description "Launch fish's web based configuration"
                         end
                         set -l promptname (string replace -r '.*/([^/]*).fish$' '$1' $p)
                         echo -s (set_color --underline) $promptname (set_color normal)
-                        $fish -c "functions -e fish_right_prompt; source $p;
+                        $fish -c 'functions -e fish_right_prompt; source $argv[1];
                         false
                         fish_prompt
                         echo (set_color normal)
                         if functions -q fish_right_prompt;
                         echo right prompt: (false; fish_right_prompt)
-                    end"
+                    end' $p
                     echo
                     end
                 case list ''
@@ -191,10 +191,10 @@ function fish_config --description "Launch fish's web based configuration"
 
                         # Use a new, --no-config, fish to display the theme.
                         # So we can use this function, explicitly source it before anything else!
-                        functions fish_config | $fish -C "source -" --no-config -c "
-                        fish_config theme choose '$themename'
-                        fish_config theme demo '$themename'
-                        "
+                        functions fish_config | $fish -C "source -" --no-config -c '
+                        fish_config theme choose $argv
+                        fish_config theme demo $argv
+                        ' $themename
                     end
 
                 case choose save