diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index 257c43649..1533ab967 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -267,6 +267,9 @@ function fish_config --description "Launch fish's web based configuration"
                         contains -- $c $have_colors
                         and continue
 
+                        # Erase conflicting global variables so we don't get a warning and
+                        # so changes are observed immediately.
+                        set -eg $c
                         set $scope $c
                     end