diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs
index a445d713cd..2f82ac9755 100644
--- a/crates/ide/src/highlight_related.rs
+++ b/crates/ide/src/highlight_related.rs
@@ -197,11 +197,14 @@ fn highlight_break_points(token: SyntaxToken) -> Option<Vec<HighlightedRange>> {
             label.as_ref().map(|it| it.syntax().text_range()),
         );
         highlights.extend(range.map(|range| HighlightedRange { category: None, range }));
-        for_each_break_expr(label, body, &mut |break_| {
-            let range = cover_range(
-                break_.break_token().map(|it| it.text_range()),
-                break_.lifetime().map(|it| it.syntax().text_range()),
-            );
+        for_each_break_expr(label, body, &mut |expr| {
+            let range: Option<TextRange> = match expr {
+                ast::Expr::BreakExpr(break_) => cover_range(
+                    break_.break_token().map(|it| it.text_range()),
+                    break_.lifetime().map(|it| it.syntax().text_range()),
+                ),
+                _ => None,
+            };
             highlights.extend(range.map(|range| HighlightedRange { category: None, range }));
         });
         Some(highlights)
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index cbe4adf1b9..0fb6ca27b2 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -121,7 +121,7 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
 
                 Some(ast::BlockModifier::Label(label)) => {
                     for_each_break_expr(Some(label), b.stmt_list(), &mut |b| {
-                        cb(&ast::Expr::BreakExpr(b))
+                        cb(&b)
                     });
                 }
                 Some(ast::BlockModifier::Unsafe(_)) => (),
@@ -151,12 +151,14 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
         }
         ast::Expr::LoopExpr(l) => {
             for_each_break_expr(l.label(), l.loop_body().and_then(|it| it.stmt_list()), &mut |b| {
-                cb(&ast::Expr::BreakExpr(b))
+                cb(&b)
             })
         }
         ast::Expr::MatchExpr(m) => {
             if let Some(arms) = m.match_arm_list() {
-                arms.arms().filter_map(|arm| arm.expr()).for_each(|e| for_each_tail_expr(&e, cb));
+                arms.arms().filter_map(|arm| arm.expr()).for_each(|e| for_each_tail_expr(&e, &mut |b| {
+                    cb(&b)
+                }));
             }
         }
         ast::Expr::ArrayExpr(_)
@@ -194,7 +196,7 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
 pub fn for_each_break_expr(
     label: Option<ast::Label>,
     body: Option<ast::StmtList>,
-    cb: &mut dyn FnMut(ast::BreakExpr),
+    cb: &mut dyn FnMut(ast::Expr),
 ) {
     let label = label.and_then(|lbl| lbl.lifetime());
     let mut depth = 0;
@@ -217,7 +219,7 @@ pub fn for_each_break_expr(
                     ast::Expr::BreakExpr(b)
                         if (depth == 0 && b.lifetime().is_none()) || eq_label(b.lifetime()) =>
                     {
-                        cb(b);
+                        cb(ast::Expr::BreakExpr(b));
                     }
                     _ => (),
                 },