diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index 0f365702269..3a5459401f9 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -30,5 +30,16 @@
 			"start": "^\\s*#pragma\\s+region\\b",
 			"end": "^\\s*#pragma\\s+endregion\\b"
 		}
-	}
+	},
+	"onEnterRules": [
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
+		}
+	]
 }