diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index 5ce74fbb1..3989ec731 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -106,7 +106,10 @@ function fish_config --description "Launch fish's web based configuration"
                     read -P"Overwrite prompt? [y/N]" -l yesno
                     if string match -riq 'y(es)?' -- $yesno
                         echo Overwriting
-                        cp $__fish_config_dir/functions/fish_prompt.fish{,.bak}
+                        # Skip the cp if unnecessary,
+                        # or we'd throw an error on a stock fish.
+                        path is $__fish_config_dir/functions/fish_prompt.fish
+                        and cp $__fish_config_dir/functions/fish_prompt.fish{,.bak}
 
                         set -l have
                         if set -q argv[1]