diff --git a/core/core-lib.el b/core/core-lib.el
index d29a0ce3c..926ff7a57 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -52,8 +52,7 @@
     (dolist (hook (if (listp hooks) hooks (list hooks)) (nreverse ret-hooks))
       (push (cond ((eq (car-safe hook) 'quote)
                    (cadr hook))
-                  ((string-suffix-p "-hook" (symbol-name hook))
-                   hook)
+                  (quoted-p hook)
                   (t
                    (intern (format "%s-hook" (symbol-name hook)))))
             ret-hooks))))