diff --git a/crates/ide-assists/src/handlers/add_braces.rs b/crates/ide-assists/src/handlers/add_braces.rs
index ccdac3074e..2f4a263ee0 100644
--- a/crates/ide-assists/src/handlers/add_braces.rs
+++ b/crates/ide-assists/src/handlers/add_braces.rs
@@ -34,7 +34,7 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
     acc.add(
         AssistId("add_braces", AssistKind::RefactorRewrite),
         match expr_type {
-            ParentType::ClosureExpr => "Add braces to lambda expression",
+            ParentType::ClosureExpr => "Add braces to closure body",
             ParentType::MatchArmExpr => "Add braces to arm expression",
         },
         expr.syntax().text_range(),
@@ -46,9 +46,7 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
 
             builder.replace(expr.syntax().text_range(), block_expr.syntax().text());
         },
-    );
-
-    Some(())
+    )
 }
 
 enum ParentType {
@@ -58,7 +56,7 @@ enum ParentType {
 
 fn get_replacement_node(ctx: &AssistContext<'_>) -> Option<(ParentType, ast::Expr)> {
     if let Some(match_arm) = ctx.find_node_at_offset::<ast::MatchArm>() {
-        let match_arm_expr = match_arm.syntax().children().find_map(ast::Expr::cast)?;
+        let match_arm_expr = match_arm.expr()?;
 
         if matches!(match_arm_expr, ast::Expr::BlockExpr(_)) {
             return None;