diff --git a/.editorconfig b/.editorconfig
index 96dc25f19..ae9e1bf67 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,8 @@
 [*]
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
 
 [*.{css,html,yml,rb}]
 indent_style = space