diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el
index 211cb4804..487908ce8 100644
--- a/modules/editor/format/autoload/format.el
+++ b/modules/editor/format/autoload/format.el
@@ -224,10 +224,11 @@ is selected)."
 ;;
 
 ;;;###autoload
-(defalias '+format|enable-on-save #'format-all-mode)
+(defun +format|enable-on-save ()
+  "Enables formatting on save."
+  (add-hook 'before-save-hook #'+format|buffer nil t))
 
 ;;;###autoload
-(defun +format|on-save ()
-  "Runs `format-all-buffer' without moving the cursor."
-  (save-excursion
-    (format-all-buffer)))
+(defun +format|buffer ()
+  "Runs `format-all-buffer' immediately, without moving the cursor."
+  (save-excursion (format-all-buffer)))
diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el
index 37f3c603d..94186e2a4 100644
--- a/modules/editor/format/config.el
+++ b/modules/editor/format/config.el
@@ -16,8 +16,9 @@ If nil, it is disabled in all modes, the same as if the +onsave flag wasn't
 ;;
 
 (defun +format|enable-on-save-maybe ()
-  "Enable `format-all-mode' in buffers. See `+format-on-save-enabled-modes' to
-control which major modes to target."
+  "Enable formatting on save in certain major modes.
+
+This is controlled by `+format-on-save-enabled-modes'."
   (unless (or (eq major-mode 'fundamental-mode)
               (cond ((booleanp +format-on-save-enabled-modes)
                      (null +format-on-save-enabled-modes))
@@ -26,7 +27,7 @@ control which major modes to target."
                     ((not (memq major-mode +format-on-save-enabled-modes))))
               (not (require 'format-all nil t))
               (not (format-all-probe)))
-    (add-hook 'before-save-hook #'+format|on-save nil t)))
+    (add-hook 'before-save-hook #'+format|buffer nil t)))
 
 (when (featurep! +onsave)
   (add-hook 'after-change-major-mode-hook #'+format|enable-on-save-maybe))