diff --git a/.editorconfig b/.editorconfig
index fced1a879a..21d66600b9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,6 +24,10 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
+[runtime/pack/dist/opt/{comment,nohlsearch}/**.vim]
+indent_style = space
+indent_size = 4
+
 [runtime/doc/**.txt]
 # It can mess up some documentation by trying to strip trailing whitespaces
 trim_trailing_whitespace = false