diff --git a/core/core-lib.el b/core/core-lib.el
index 6f66cdafe..3ea39d001 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -232,7 +232,8 @@ compilation. This will no-op on features that have been disabled by the user."
                           (put ',fun 'permanent-local-hook t)
                           (add-hook 'after-load-functions #',fun)))))
                 ((symbolp targets)
-                 `(eval-after-load ',targets '(progn ,@body)))
+                 `(with-eval-after-load ',targets
+                    ,@body))
                 ((and (consp targets)
                       (memq (car targets) '(:or :any)))
                  `(progn