diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index 9192bf650..223f8d974 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -235,6 +235,50 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'."
              (put-text-property start finish 'display "...")))))
   nil)
 
+;;;###autoload
+(defun +emacs-lisp-indent-function (indent-point state)
+  "A replacement for `lisp-indent-function'.
+
+Indents plists more sensibly. Adapted from
+https://emacs.stackexchange.com/questions/10230/how-to-indent-keywords-aligned"
+  (let ((normal-indent (current-column))
+        (orig-point (point)))
+    (goto-char (1+ (elt state 1)))
+    (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
+    (cond ((and (elt state 2)
+                (or (not (looking-at-p "\\sw\\|\\s_"))
+                    (eq (char-after) ?:)))
+           (unless (> (save-excursion (forward-line 1) (point))
+                      calculate-lisp-indent-last-sexp)
+             (goto-char calculate-lisp-indent-last-sexp)
+             (beginning-of-line)
+             (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t))
+           (backward-prefix-chars)
+           (current-column))
+          ((and (save-excursion
+                  (goto-char indent-point)
+                  (skip-syntax-forward " ")
+                  (not (eq (char-after) ?:)))
+                (save-excursion
+                  (goto-char orig-point)
+                  (eq (char-after) ?:)))
+           (save-excursion
+             (goto-char (+ 2 (elt state 1)))
+             (current-column)))
+          ((let* ((function (buffer-substring (point) (progn (forward-sexp 1) (point))))
+                  (method (or (function-get (intern-soft function) 'lisp-indent-function)
+                              (get (intern-soft function) 'lisp-indent-hook))))
+             (cond ((or (eq method 'defun)
+                        (and (null method)
+                             (> (length function) 3)
+                             (string-match-p "\\`def" function)))
+                    (lisp-indent-defform state indent-point))
+                   ((integerp method)
+                    (lisp-indent-specform method state
+                                          indent-point normal-indent))
+                   (method
+                    (funcall method indent-point state))))))))
+
 ;;;###autoload
 (defun +emacs-lisp/edebug-instrument-defun-on ()
   "Toggle on instrumentalisation for the function under `defun'."
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 521f4192c..6f80d6cfd 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -43,7 +43,9 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
     mode-name "Elisp"
     ;; Don't treat autoloads or sexp openers as outline headers, we have
     ;; hideshow for that.
-    outline-regexp +emacs-lisp-outline-regexp)
+    outline-regexp +emacs-lisp-outline-regexp
+    ;; Fixed indenter that intends plists sensibly.
+    lisp-indent-function #'+emacs-lisp-indent-function)
 
   ;; variable-width indentation is superior in elisp
   (add-to-list 'doom-detect-indentation-excluded-modes 'emacs-lisp-mode nil #'eq)