diff --git a/lisp/doom-cli.el b/lisp/doom-cli.el
index 3fcb28523..715b771d5 100644
--- a/lisp/doom-cli.el
+++ b/lisp/doom-cli.el
@@ -439,10 +439,11 @@ an integer.
 
 This cannot see autoloaded CLIs. Use `doom-cli-load' or `doom-cli-load-all'
 to reach them."
-  (cl-loop for rcli in (hash-table-values doom-cli--table)
-           if (equal (doom-cli-key (doom-cli-get rcli))
-                     (doom-cli-key rcli))
-           collect rcli))
+  (cl-loop with cli = (doom-cli-get cli)
+           with key = (doom-cli-key cli)
+           for rcli in (hash-table-values doom-cli--table)
+           if (equal key (doom-cli-key rcli))
+           collect cli))
 
 (defun doom-cli-short-docs (cli)
   "Return the first line of CLI's documentation.