diff --git a/Completion/Builtins/_cd b/Completion/Builtins/_cd
index 6e1790df3..4cb070811 100644
--- a/Completion/Builtins/_cd
+++ b/Completion/Builtins/_cd
@@ -38,7 +38,7 @@ elif _popd || [[ $PREFIX != (\~|/|./|../)* && $#cdpath -ne 0 ]]; then
       _path_files -/
   else
     local tmpcdpath
-    tmpcdpath=(${(@)cdpath:#.})
+    tmpcdpath=(${${(@)cdpath:#.}:#$PWD})
     _alternative \
         'local-directories:local directories:_path_files -/' \
 	"path-directories:directories in cdpath:_path_files -W tmpcdpath -/"