diff --git a/.editorconfig b/.editorconfig
index 008b61ed63f..12b242448ba 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,17 +11,17 @@ trim_trailing_whitespace = true
 indent_style = tab
 indent_size = 8
 
-[*.tmpl]
-indent_style = tab
-indent_size = 2
-
-[Makefile]
+[*.{tmpl,html}]
 indent_style = tab
+indent_size = 4
 
 [*.{less,yml}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.js]
 indent_style = space
 indent_size = 4
+
+[Makefile]
+indent_style = tab