diff --git a/share/completions/echo.fish b/share/completions/echo.fish
index 06108a7af..8a187a5ff 100644
--- a/share/completions/echo.fish
+++ b/share/completions/echo.fish
@@ -3,3 +3,4 @@ complete -c echo -s e --description "Use backslash escaped characters"
 complete -c echo -s E --description "Do not use backslash escaped characters"
 complete -c echo -l help --description "Display help and exit"
 complete -c echo -l version --description "Display version and exit"
+complete -c echo -u
diff --git a/share/completions/function.fish b/share/completions/function.fish
index 3620c07bd..8e8bcddc7 100644
--- a/share/completions/function.fish
+++ b/share/completions/function.fish
@@ -7,3 +7,4 @@ complete -c function -s s -l on-signal --description "Make the function a signal
 complete -c function -s v -l on-variable --description "Make the function a variable update event handler" -x
 complete -c function -s b -l key-binding --description "Allow dash (-) in function name"
 complete -c function -s a -l argument-names --description "Specify named arguments"
+complete -c function -s S -l no-scope-shadowing --description "Do not shadow variable scope of calling function"
diff --git a/share/completions/set.fish b/share/completions/set.fish
index b306822b6..4ff267162 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -77,3 +77,5 @@ complete -c set -n '__fish_set_is_color' -s o -l bold --description 'Make font b
 # Locale completions
 complete -c set -n '__fish_is_first_token' -x -a '$__fish_locale_vars' -d 'Locale variable'
 complete -c set -n '__fish_set_is_locale' -x -a '(locale -a)' -d (_ Locale)
+
+complete -c set -u
\ No newline at end of file