diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 473d81600..1c667fefc 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -439,11 +439,12 @@ in {
         # add completions generated by Home Manager to $fish_complete_path
         begin
           set -l joined (string join " " $fish_complete_path)
-          set -l prev_joined (string replace --regex "[^\s]*generated_completions.*" "" $joined)
+          set -l prev_joined (string replace --regex "[^\s]*home-manager-path/share/fish/vendor_completions\.d" "" $joined)
+          set -l prev_joined (string replace --regex "[^\s]*generated_completions.*" "" $prev_joined)
           set -l post_joined (string replace $prev_joined "" $joined)
           set -l prev (string split " " (string trim $prev_joined))
           set -l post (string split " " (string trim $post_joined))
-          set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
+          set fish_complete_path $prev "${config.home.path}/share/fish/vendor_completions.d" "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
         end
       '';