diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs
index 8c3a4ae2..61808fbe 100644
--- a/src/widget/segmented_button/widget.rs
+++ b/src/widget/segmented_button/widget.rs
@@ -981,11 +981,12 @@ where
 
             let Some((mut bounds, i)) = self
                 .variant_bounds(state, layout.bounds())
-                .enumerate()
-                .find_map(|(i, item)| match item {
-                    ItemBounds::Button(e, bounds) if e == entity => Some((bounds, i)),
+                .filter_map(|item| match item {
+                    ItemBounds::Button(entity, bounds) => Some((bounds, entity)),
                     _ => None,
                 })
+                .enumerate()
+                .find_map(|(i, (bounds, e))| if e == entity { Some((bounds, i)) } else { None })
             else {
                 return;
             };
@@ -2581,11 +2582,12 @@ where
 
         let (mut bounds, i) = self
             .variant_bounds(state, layout.bounds())
-            .enumerate()
-            .find_map(|(i, item)| match item {
-                ItemBounds::Button(e, bounds) if e == entity => Some((bounds, i)),
+            .filter_map(|item| match item {
+                ItemBounds::Button(entity, bounds) => Some((bounds, entity)),
                 _ => None,
-            })?;
+            })
+            .enumerate()
+            .find_map(|(i, (bounds, e))| if e == entity { Some((bounds, i)) } else { None })?;
 
         assert!(
             self.context_menu