diff --git a/src/widget/segmented_button/horizontal.rs b/src/widget/segmented_button/horizontal.rs
index c6241c16..d8c8daa7 100644
--- a/src/widget/segmented_button/horizontal.rs
+++ b/src/widget/segmented_button/horizontal.rs
@@ -117,8 +117,7 @@ where
         state.internal_layout.clear();
         let num = self.model.order.len();
         let spacing = f32::from(self.spacing);
-        let limits = limits.width(self.width);
-        let mut size;
+        let size;
 
         if state.known_length != num {
             if state.known_length > num {
@@ -141,7 +140,6 @@ where
                 Size::new(f32::MAX, max_height),
             );
 
-            // let mut visible_width = f32::from(self.button_height) * 2.0;
             let mut visible_width = 0.0;
             state.buttons_visible = 0;
 
@@ -151,6 +149,7 @@ where
                 if max_size.width >= visible_width {
                     state.buttons_visible += 1;
                 } else {
+                    visible_width -= button_size.width - (max_height * 2.0);
                     break;
                 }
 
@@ -161,25 +160,15 @@ where
 
             state.collapsed = num > 1 && state.buttons_visible != num;
 
-            // If collapsed, use the maximum width available.
-            if state.collapsed {
-                visible_width = max_size.width;
-            }
-
             size = limits
-                .width(Length::Fixed(visible_width))
                 .height(Length::Fixed(max_height))
-                .resolve(
-                    visible_width,
-                    max_height,
-                    Size::new(visible_width, max_height),
-                );
+                .min_width(visible_width)
+                .min();
         } else {
             // Buttons will be rendered with equal widths.
             state.buttons_visible = self.model.items.len();
 
             let mut width = 0.0f32;
-            let mut height = 0.0f32;
             let font = renderer.default_font();
 
             for key in self.model.order.iter().copied() {
@@ -195,29 +184,18 @@ where
                     ),
                 ));
 
-                height = height.max(button_height);
                 width = width.max(button_width);
             }
 
-            let total_width = (state.buttons_visible as f32) * (width + spacing);
+            let height = f32::from(self.button_height);
 
-            size = limits.height(Length::Fixed(height)).resolve(
-                self.width,
-                self.height,
-                Size::new(total_width, height),
-            );
+            size = limits.height(Length::Fixed(height)).max();
 
             let actual_width = size.width as usize;
             let minimum_width = state.buttons_visible * self.minimum_button_width as usize;
             state.collapsed = actual_width < minimum_width;
 
             if state.collapsed {
-                size = limits.height(Length::Fixed(height)).resolve(
-                    Length::Fill,
-                    height,
-                    Size::new(f32::MAX, height),
-                );
-
                 state.buttons_visible =
                     (actual_width / self.minimum_button_width as usize).min(state.buttons_visible);
             }
diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs
index ffd3bb27..3c4807c0 100644
--- a/src/widget/segmented_button/widget.rs
+++ b/src/widget/segmented_button/widget.rs
@@ -321,7 +321,6 @@ where
         button: Entity,
     ) -> (f32, f32) {
         let mut width = 0.0f32;
-        let mut height = 0.0f32;
 
         // Add text to measurement if text was given.
         if let Some((text, entry)) = self
@@ -345,7 +344,6 @@ where
 
             let size = paragraph.min_bounds();
             width += size.width;
-            height += size.height;
         }
 
         // Add indent to measurement if found.
@@ -370,10 +368,8 @@ where
 
         // Add button padding to the max size found
         width += f32::from(self.button_padding[0]) + f32::from(self.button_padding[2]);
-        height += f32::from(self.button_padding[1]) + f32::from(self.button_padding[3]);
-        height = height.max(f32::from(self.button_height));
 
-        (width, height)
+        (width, f32::from(self.button_height))
     }
 
     pub(super) fn max_button_dimensions(
@@ -1074,7 +1070,6 @@ where
                 );
 
                 bounds.x += offset;
-                bounds.width -= offset;
             } else {
                 // Draw the selection indicator if widget is a segmented selection, and the item is selected.
                 if key_is_active {
@@ -1109,7 +1104,6 @@ where
                         let offset = 16.0 + f32::from(self.button_spacing);
 
                         bounds.x += offset;
-                        bounds.width -= offset;
                     }
                 }
             }
@@ -1126,6 +1120,11 @@ where
                 0.0
             };
 
+            bounds.width = original_bounds.width
+                - (bounds.x - original_bounds.x)
+                - close_icon_width
+                - f32::from(self.button_padding[2]);
+
             if self.model.text(key).is_some() {
                 bounds.y = center_y;
 
@@ -1135,7 +1134,8 @@ where
                     bounds.position(),
                     apply_alpha(status_appearance.text_color),
                     Rectangle {
-                        width: bounds.width - close_icon_width,
+                        x: bounds.x,
+                        width: bounds.width,
                         ..original_bounds
                     },
                 );
@@ -1281,7 +1281,7 @@ fn close_bounds(area: Rectangle<f32>, icon_size: f32) -> Rectangle<f32> {
 fn next_tab_bounds(bounds: &Rectangle, button_height: f32) -> Rectangle {
     Rectangle {
         x: bounds.x + bounds.width - button_height,
-        y: bounds.y + button_height / 4.0,
+        y: bounds.y,
         width: button_height,
         height: button_height,
     }
@@ -1291,7 +1291,7 @@ fn next_tab_bounds(bounds: &Rectangle, button_height: f32) -> Rectangle {
 fn prev_tab_bounds(bounds: &Rectangle, button_height: f32) -> Rectangle {
     Rectangle {
         x: bounds.x,
-        y: bounds.y + button_height / 4.0,
+        y: bounds.y,
         width: button_height,
         height: button_height,
     }