diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 0000000..9a13de8
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*.{xaml,cpp,h}]
+charset = utf-8-bom
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+
+[*.{cpp,h}]
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/src/Calculator.sln b/src/Calculator.sln
index 2d36a93..2a6989f 100644
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@@ -9,6 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcManager", "CalcManager\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject