diff --git a/crates/languages/src/c/config.toml b/crates/languages/src/c/config.toml
index 08cd100f4d..78213da5be 100644
--- a/crates/languages/src/c/config.toml
+++ b/crates/languages/src/c/config.toml
@@ -2,6 +2,10 @@ name = "C"
 grammar = "c"
 path_suffixes = ["c"]
 line_comments = ["// "]
+decrease_indent_patterns = [
+  { pattern = "^\\s*\\{.*\\}?\\s*$", valid_after = ["if", "for", "while", "do", "switch", "else"] },
+  { pattern = "^\\s*else\\s*$", valid_after = ["if"] }
+]
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/languages/src/c/indents.scm b/crates/languages/src/c/indents.scm
index fa40ce215e..3b6d5135ab 100644
--- a/crates/languages/src/c/indents.scm
+++ b/crates/languages/src/c/indents.scm
@@ -3,7 +3,17 @@
   (assignment_expression)
   (if_statement)
   (for_statement)
+  (while_statement)
+  (do_statement)
+  (else_clause)
 ] @indent
 
 (_ "{" "}" @end) @indent
 (_ "(" ")" @end) @indent
+
+(if_statement) @start.if
+(for_statement) @start.for
+(while_statement) @start.while
+(do_statement) @start.do
+(switch_statement) @start.switch
+(else_clause) @start.else
diff --git a/crates/languages/src/cpp/config.toml b/crates/languages/src/cpp/config.toml
index a81cbe09cd..1e28381605 100644
--- a/crates/languages/src/cpp/config.toml
+++ b/crates/languages/src/cpp/config.toml
@@ -2,6 +2,10 @@ name = "C++"
 grammar = "cpp"
 path_suffixes = ["cc", "hh", "cpp", "h", "hpp", "cxx", "hxx", "c++", "ipp", "inl", "ixx", "cu", "cuh", "C", "H"]
 line_comments = ["// ", "/// ", "//! "]
+decrease_indent_patterns = [
+  { pattern = "^\\s*\\{.*\\}?\\s*$", valid_after = ["if", "for", "while", "do", "switch", "else"] },
+  { pattern = "^\\s*else\\s*$", valid_after = ["if"] }
+]
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/languages/src/cpp/indents.scm b/crates/languages/src/cpp/indents.scm
index a17f4c4821..d95dfe178c 100644
--- a/crates/languages/src/cpp/indents.scm
+++ b/crates/languages/src/cpp/indents.scm
@@ -1,7 +1,19 @@
 [
     (field_expression)
     (assignment_expression)
+    (if_statement)
+    (for_statement)
+    (while_statement)
+    (do_statement)
+    (else_clause)
 ] @indent
 
 (_ "{" "}" @end) @indent
 (_ "(" ")" @end) @indent
+
+(if_statement) @start.if
+(for_statement) @start.for
+(while_statement) @start.while
+(do_statement) @start.do
+(switch_statement) @start.switch
+(else_clause) @start.else