diff --git a/modules/feature/evil/autoload/advice.el b/modules/feature/evil/autoload/advice.el
index 8f9a97158..114ff4192 100644
--- a/modules/feature/evil/autoload/advice.el
+++ b/modules/feature/evil/autoload/advice.el
@@ -8,7 +8,8 @@
       (funcall orig-fn count)
     (cl-letf (((symbol-function 'evil-insert-newline-below)
                (lambda ()
-                 (let ((pos (save-excursion (beginning-of-line-text) (point))))
+                 (let ((pos (save-excursion (beginning-of-line-text) (point)))
+                       comment-auto-fill-only-comments)
                    (evil-narrow-to-field
                      (evil-move-end-of-line)
                      (require 'smartparens)
@@ -31,7 +32,8 @@
       (funcall orig-fn count)
     (cl-letf (((symbol-function 'evil-insert-newline-above)
                (lambda ()
-                 (let ((pos (save-excursion (beginning-of-line-text) (point))))
+                 (let ((pos (save-excursion (beginning-of-line-text) (point)))
+                       comment-auto-fill-only-comments)
                    (evil-narrow-to-field
                      (require 'smartparens)
                      (if (save-excursion (nth 4 (sp--syntax-ppss pos)))