diff --git a/source/command-commands.lisp b/source/command-commands.lisp
index 9d1218e18ed..6bd2518ff73 100644
--- a/source/command-commands.lisp
+++ b/source/command-commands.lisp
@@ -24,16 +24,20 @@
 
 (define-class command-source (prompter:source)
   ((prompter:name "Commands")
-   (global-p t
-             :type boolean
-             :documentation "Whether global commands are included in the suggestions.")
-   (buffer (current-buffer)
-           :type buffer)
-   (prompter:constructor (lambda (source)
-                           (sort-by-time
-                            (list-commands
-                             :global-p (global-p source)
-                             :mode-symbols (mapcar #'sera:class-name-of (sera:filter #'enabled-p (modes (buffer source))))))))
+   (global-p
+    t
+    :type boolean
+    :documentation "Whether global commands are included in the suggestions.")
+   (buffer
+    (current-buffer)
+    :type buffer)
+   (prompter:constructor
+    (lambda (source)
+      (sort-by-time
+       (list-commands :global-p (global-p source)
+                      :mode-symbols (mapcar #'sera:class-name-of
+                                            (sera:filter #'enabled-p
+                                                         (modes (buffer source))))))))
    (prompter:active-attributes-keys
     '("Name" "Bindings" "Docstring")
     :accessor nil)