diff --git a/modules/editor/lispy/config.el b/modules/editor/lispy/config.el
index 3ca5ebb7872..a4556cbe4a0 100644
--- a/modules/editor/lispy/config.el
+++ b/modules/editor/lispy/config.el
@@ -38,4 +38,14 @@
           additional
           additional-insert))
   :config
-  (lispyville-set-key-theme))
+  (lispyville-set-key-theme)
+;; REVIEW Delete this once https://github.com/noctuid/lispyville/pull/297 is merged
+  (defadvice! +lispy--fix-lispyville-end-of-defun-a (_)
+    "lispyville-end-of-defun doesn't go to the next defun when
+point is already at the end of a defun, whereas
+lispyville-beginning-of-defun does."
+    :before #'lispyville-end-of-defun
+    (when (<= (- (line-end-position)
+                 (point))
+              1)
+      (forward-line))))