diff --git a/modules/editor/fold/config.el b/modules/editor/fold/config.el
index 8e5a445ed..fd478b236 100644
--- a/modules/editor/fold/config.el
+++ b/modules/editor/fold/config.el
@@ -53,7 +53,19 @@
                           nil (lambda (_arg) (matlab-forward-sexp)))
              (nxml-mode "<!--\\|<[^/>]*[^/]>"
                         "-->\\|</[^/>]*[^/]>"
-                        "<!--" sgml-skip-tag-forward nil))
+                        "<!--" sgml-skip-tag-forward nil)
+             (latex-mode
+              ;; LaTeX-find-matching-end needs to be inside the env
+              ("\\\\begin{[a-zA-Z*]+}\\(\\)" 1)
+              "\\\\end{[a-zA-Z*]+}"
+              "%"
+              (lambda (_arg)
+                ;; Don't fold whole document, that's useless
+                (unless (save-excursion
+                          (search-backward "\\begin{document}"
+                                           (line-beginning-position) t))
+                  (LaTeX-find-matching-end)))
+              nil))
            hs-special-modes-alist
            '((t))))))