diff --git a/etc/fish_interactive.fish.in b/etc/fish_interactive.fish.in
index c54a5fa33..1caef740c 100644
--- a/etc/fish_interactive.fish.in
+++ b/etc/fish_interactive.fish.in
@@ -45,9 +45,12 @@ end
 # Set various color values
 #
 
-function set_default -d "Set an exported universal variable, unless it has already been set"
+function set_default -d "Set an universal variable, unless it has already been set"
 	if not set -q $argv[1]
-		set -Ux -- $argv	
+		set -U -- $argv	
+	end
+	if not set -q $argv[1]
+		set -g -- $argv	
 	end
 end
 
@@ -55,6 +58,9 @@ function set_exported_default -d "Set an exported universal variable, unless it
 	if not set -q $argv[1]
 		set -Ux -- $argv	
 	end
+	if not set -q $argv[1]
+		set -gx -- $argv	
+	end
 end