diff --git a/.editorconfig b/.editorconfig
index b0a2889a1..3cf844c4f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,10 +2,12 @@ root = true
 
 [*]
 end_of_line = lf
-# Turned off because some editors otherwise remove trailing spaces within
-# multi-line string literals (intellij-rust/intellij-rust#5368).
-trim_trailing_whitespace = false
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.rs]
 indent_style = space
 indent_size = 4
+# Turned off because some editors otherwise remove trailing spaces within
+# multi-line string literals (intellij-rust/intellij-rust#5368).
+trim_trailing_whitespace = false