diff --git a/.editorconfig b/.editorconfig
index e38e21957..39320baaf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,10 @@ root = true
 [*]
 indent_style = space
 indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Makefile
+[Makefile]
+indent_style = tab
+indent_size = 4
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 85771c9ec..83ccbcee2 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -34,6 +34,7 @@ HOW TO UPDATE?
 -----------------------------------------------------------------------
 
 Other Changes:
+- Added .editorconfig file for text editors to standardize using spaces. (#2038) [@kudaba]
 - ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle"
   with a small number of segments (e.g. an hexagon). (#2287) [@baktery]
 - Fonts: imgui_freetype: Added support for imgui allocators + custom FreeType only SetAllocatorFunctions. (#2285) [@Vuhdo]