diff --git a/core/core-modules.el b/core/core-modules.el
index f3c22fb71..c866e1289 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -211,13 +211,15 @@ those directories. The first returned path is always `doom-private-dir'."
   (declare (pure t) (side-effect-free t))
   (append (list doom-private-dir)
           (if module-dirs
-              (doom-files-in (if (listp module-dirs)
-                                 module-dirs
-                               doom-modules-dirs)
-                             :type 'dirs
-                             :mindepth 1
-                             :depth 1)
-            (cl-loop for plist being the hash-values of (doom-modules)
+              (mapcar (lambda (m) (doom-module-locate-path (car m) (cdr m)))
+                      (doom-files-in (if (listp module-dirs)
+                                         module-dirs
+                                       doom-modules-dirs)
+                                     :map #'doom-module-from-path
+                                     :type 'dirs
+                                     :mindepth 1
+                                     :depth 1))
+            (cl-loop for plist being the hash-values of doom-modules
                      collect (plist-get plist :path)))
           nil))