diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift
index c813d058..16c5381f 100644
--- a/Sources/Swiftly/Init.swift
+++ b/Sources/Swiftly/Init.swift
@@ -114,10 +114,8 @@ struct Init: SwiftlyCommand {
             set -x SWIFTLY_TOOLCHAINS_DIR "\(Swiftly.currentPlatform.swiftlyToolchainsDir(ctx))"
 
             # Remove SWIFTLY_BIN_DIR from PATH if present, then prepend it
-            while set -l index (contains -i "$SWIFTLY_BIN_DIR" $PATH)
-                set -e PATH[$index]
-            end
-            set -x PATH "$SWIFTLY_BIN_DIR" $PATH
+            set -gx PATH (string match -v -- "$SWIFTLY_BIN_DIR" $PATH)
+            fish_add_path -P "$SWIFTLY_BIN_DIR"
 
             """
         }