diff --git a/.editorconfig b/.editorconfig
index 7b1b4dd59..b26f9c7f2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,15 +7,17 @@ charset = utf-8
 end_of_line = LF
 indent_size = 2
 trim_trailing_whitespace = true
-insert_final_newline = true
 indent_style = space
 
 [*.md]
 trim_trailing_whitespace = false
 max_line_length = 80
 
-[*.{yml,php,html,twig,js}]
+[*.{yml,php,html,twig}]
 indent_size = 4
 
+[*.{js}]
+indent_size = 2
+
 [COMMIT_EDITMSG]
 max_line_length = 0
diff --git a/demo/.editorconfig b/demo/.editorconfig
index c4d3710bb..b26f9c7f2 100644
--- a/demo/.editorconfig
+++ b/demo/.editorconfig
@@ -13,8 +13,11 @@ indent_style = space
 trim_trailing_whitespace = false
 max_line_length = 80
 
-[*.{php,html,twig,js}]
+[*.{yml,php,html,twig}]
 indent_size = 4
 
+[*.{js}]
+indent_size = 2
+
 [COMMIT_EDITMSG]
 max_line_length = 0