diff --git a/.editorconfig b/.editorconfig
index aba3f42cf39..be697ae970f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,6 +21,11 @@ indent_size = 8
 indent_style = tab
 indent_size = 8
 
+# C++
+[*.{cpp,hpp}]
+indent_style = tab
+indent_size = 8
+
 # Linker Script
 [*.ld]
 indent_style = tab