diff --git a/modules/module-elisp.el b/modules/module-elisp.el
index 660cc4df0..a52179743 100644
--- a/modules/module-elisp.el
+++ b/modules/module-elisp.el
@@ -7,6 +7,14 @@
 (defadvice emacs-lisp-mode (after emacs-lisp-mode-rename-modeline activate)
   (setq mode-name "Elisp"))
 
+(defun narf-elisp-auto-compile ()
+  (when (narf/is-compilable-p)
+    (narf:compile-el)))
+
+(add-hook! emacs-lisp-mode
+  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
+  (add-hook 'after-save-hook 'narf-elisp-auto-compile nil t))
+
 ;; Real go-to-definition for elisp
 (bind! :map emacs-lisp-mode-map
        :m "gd" 'narf/elisp-find-function-at-pt