diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 77ff567954f..55f9fb1988b 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -530,6 +530,7 @@ If INTERACTIVE, display it.  Else, return said buffer."
           (things-reported-on))
       (special-mode)
       (erase-buffer)
+      (visual-line-mode)
       (setq-local nobreak-char-display nil)
       (cl-loop for (docs . rest) on docs
                for (this-doc . plist) = docs