diff --git a/share/functions/__fish_complete_cd.fish b/share/functions/__fish_complete_cd.fish
index f530120ca..190f9b935 100644
--- a/share/functions/__fish_complete_cd.fish
+++ b/share/functions/__fish_complete_cd.fish
@@ -30,14 +30,9 @@ function __fish_complete_cd -d "Completions for the cd command"
         set -l desc (string replace -r -- "^$HOME" "~" "$cdpath")
         # This assumes the CDPATH component itself is cd-able.
         for d in $cdpath/$token*/
-            set -l withoutcdpath (string replace -- "$cdpath/" "" $d)
-            # Skip if the path exists in the current directory, since that's what `cd` will use.
-            if test -d "$withoutcdpath" -a -x "$withoutcdpath"
-                continue
-            end
             # Remove the cdpath component again.
             test -x $d
-            and printf "%s\tCDPATH %s\n" "$withoutcdpath" $desc
+            and printf "%s\tCDPATH %s\n" (string replace -r "^$cdpath/" "" -- $d) $desc
         end
     end
 end