diff --git a/crates/story/src/button_story.rs b/crates/story/src/button_story.rs
index ec6cc90d..c2e8b013 100644
--- a/crates/story/src/button_story.rs
+++ b/crates/story/src/button_story.rs
@@ -21,6 +21,7 @@ pub struct ButtonStory {
     loading: bool,
     selected: bool,
     compact: bool,
+    multiple: bool,
 }
 
 impl ButtonStory {
@@ -31,6 +32,7 @@ impl ButtonStory {
             loading: false,
             selected: false,
             compact: false,
+            multiple: false,
         })
     }
 
@@ -69,6 +71,7 @@ impl Render for ButtonStory {
         let loading = self.loading;
         let selected = self.selected;
         let compact = self.compact;
+        let multiple = self.multiple;
 
         v_flex()
             .gap_6()
@@ -435,6 +438,7 @@ impl Render for ButtonStory {
             .child(
                 section("Button Group", cx).child(
                     ButtonGroup::new("button-group")
+                        .disabled(disabled)
                         .child(
                             Button::new("button-one", cx)
                                 .label("One")
@@ -464,6 +468,49 @@ impl Render for ButtonStory {
                         ),
                 ),
             )
+            .child(
+                section("Toggle Button Group", cx)
+                    .child(
+                        Checkbox::new("multiple-button")
+                            .label("Multiple")
+                            .checked(self.multiple)
+                            .on_click(cx.listener(|view, _, cx| {
+                                view.multiple = !view.multiple;
+                                cx.notify();
+                            })),
+                    )
+                    .child(
+                        ButtonGroup::new("toggle-button-group")
+                            .multiple(multiple)
+                            .child(
+                                Button::new("disabled-toggle-button", cx)
+                                    .label("Disabled")
+                                    .selected(disabled),
+                            )
+                            .child(
+                                Button::new("loading-toggle-button", cx)
+                                    .label("Loading")
+                                    .selected(loading),
+                            )
+                            .child(
+                                Button::new("selected-toggle-button", cx)
+                                    .label("Selected")
+                                    .selected(selected),
+                            )
+                            .child(
+                                Button::new("compact-toggle-button", cx)
+                                    .label("Compact")
+                                    .selected(compact),
+                            )
+                            .on_click(cx.listener(|view, selected: &Vec<usize>, cx| {
+                                view.disabled = selected.contains(&0);
+                                view.loading = selected.contains(&1);
+                                view.selected = selected.contains(&2);
+                                view.compact = selected.contains(&3);
+                                cx.notify();
+                            })),
+                    ),
+            )
             .child(
                 section("Icon Button", cx)
                     .child(
diff --git a/crates/ui/src/button.rs b/crates/ui/src/button.rs
index 1592663f..f3d80346 100644
--- a/crates/ui/src/button.rs
+++ b/crates/ui/src/button.rs
@@ -106,7 +106,7 @@ pub struct Button {
     label: Option<SharedString>,
     children: Vec<AnyElement>,
     disabled: bool,
-    selected: bool,
+    pub(crate) selected: bool,
     style: ButtonStyle,
     rounded: ButtonRounded,
     border_corners: Corners<bool>,
@@ -115,6 +115,7 @@ pub struct Button {
     compact: bool,
     tooltip: Option<SharedString>,
     on_click: Option<Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
+    pub(crate) stop_propagation: bool,
     loading: bool,
 }
 
@@ -141,6 +142,7 @@ impl Button {
             size: Size::Medium,
             tooltip: None,
             on_click: None,
+            stop_propagation: true,
             loading: false,
             compact: false,
             children: Vec::new(),
@@ -247,6 +249,11 @@ impl Button {
         self.on_click = Some(Box::new(handler));
         self
     }
+
+    pub fn stop_propagation(mut self, val: bool) -> Self {
+        self.stop_propagation = val;
+        self
+    }
 }
 
 impl Disableable for Button {
@@ -371,9 +378,12 @@ impl RenderOnce for Button {
             .when_some(
                 self.on_click.filter(|_| !self.disabled && !self.loading),
                 |this, on_click| {
-                    this.on_mouse_down(MouseButton::Left, |_, cx| {
+                    let stop_propagation = self.stop_propagation;
+                    this.on_mouse_down(MouseButton::Left, move |_, cx| {
                         cx.prevent_default();
-                        cx.stop_propagation()
+                        if stop_propagation {
+                            cx.stop_propagation();
+                        }
                     })
                     .on_click(move |event, cx| {
                         (on_click)(event, cx);
diff --git a/crates/ui/src/button_group.rs b/crates/ui/src/button_group.rs
index 15080921..13e23d65 100644
--- a/crates/ui/src/button_group.rs
+++ b/crates/ui/src/button_group.rs
@@ -1,15 +1,26 @@
 use gpui::{
-    div, Corners, Div, Edges, ElementId, InteractiveElement, IntoElement, ParentElement,
-    RenderOnce, Styled, WindowContext,
+    div, prelude::FluentBuilder as _, Corners, Div, Edges, ElementId, InteractiveElement,
+    IntoElement, ParentElement, RenderOnce, StatefulInteractiveElement as _, Styled, WindowContext,
 };
+use std::{cell::Cell, rc::Rc};
 
-use crate::button::Button;
+use crate::{button::Button, Disableable};
 
 #[derive(IntoElement)]
 pub struct ButtonGroup {
     pub base: Div,
     id: ElementId,
     children: Vec<Button>,
+    multiple: bool,
+    disabled: bool,
+    on_click: Option<Box<dyn Fn(&Vec<usize>, &mut WindowContext) + 'static>>,
+}
+
+impl Disableable for ButtonGroup {
+    fn disabled(mut self, disabled: bool) -> Self {
+        self.disabled = disabled;
+        self
+    }
 }
 
 impl ButtonGroup {
@@ -19,12 +30,27 @@ impl ButtonGroup {
             base: div(),
             children: Vec::new(),
             id: id.into(),
+            multiple: false,
+            disabled: false,
+            on_click: None,
         }
     }
 
     /// Adds a button as a child to the ButtonGroup.
     pub fn child(mut self, child: Button) -> Self {
-        self.children.push(child);
+        self.children.push(child.disabled(self.disabled));
+        self
+    }
+
+    /// Sets the multiple selection mode.
+    pub fn multiple(mut self, multiple: bool) -> Self {
+        self.multiple = multiple;
+        self
+    }
+
+    /// Sets the on_click handler for the ButtonGroup.
+    pub fn on_click(mut self, handler: impl Fn(&Vec<usize>, &mut WindowContext) + 'static) -> Self {
+        self.on_click = Some(Box::new(handler));
         self
     }
 }
@@ -38,19 +64,30 @@ impl Styled for ButtonGroup {
 impl RenderOnce for ButtonGroup {
     fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
         let children_len = self.children.len();
-        // Render a div container with a flex layout to group buttons horizontally.
+        let mut selected: Vec<usize> = Vec::new();
+        let shared_state = Rc::new(Cell::new(None)); // Shared state to store the child index
+
+        for (child_index, child) in self.children.iter().enumerate() {
+            if child.selected {
+                selected.push(child_index);
+            }
+        }
+
         self.base
             .id(self.id)
             .flex()
             .items_center()
-            .children(if children_len > 1 {
+            .children(
                 self.children
                     .into_iter()
                     .enumerate()
-                    .map(|(index, button)| {
-                        if index == 0 {
+                    .map(|(child_index, child)| {
+                        let shared_state_clone = Rc::clone(&shared_state);
+                        let child = if children_len == 1 {
+                            child
+                        } else if child_index == 0 {
                             // First
-                            button
+                            child
                                 .border_corners(Corners {
                                     top_left: true,
                                     top_right: false,
@@ -63,9 +100,9 @@ impl RenderOnce for ButtonGroup {
                                     right: true,
                                     bottom: true,
                                 })
-                        } else if index == children_len - 1 {
+                        } else if child_index == children_len - 1 {
                             // Last
-                            button
+                            child
                                 .border_edges(Edges {
                                     left: false,
                                     top: true,
@@ -80,7 +117,7 @@ impl RenderOnce for ButtonGroup {
                                 })
                         } else {
                             // Middle
-                            button
+                            child
                                 .border_corners(Corners::all(false))
                                 .border_edges(Edges {
                                     left: false,
@@ -89,10 +126,35 @@ impl RenderOnce for ButtonGroup {
                                     bottom: true,
                                 })
                         }
+                        .stop_propagation(false)
+                        .on_click(move |_, cx| {
+                            shared_state_clone.set(Some(child_index));
+                        });
+
+                        child
+                    }),
+            )
+            .when_some(
+                self.on_click.filter(|_| !self.disabled),
+                move |this, on_click| {
+                    this.on_click(move |_, cx| {
+                        let mut selected = selected.clone();
+                        if let Some(index) = shared_state.get() {
+                            if self.multiple {
+                                if let Some(pos) = selected.iter().position(|&i| i == index) {
+                                    selected.remove(pos); // Toggle off if already selected
+                                } else {
+                                    selected.push(index); // Toggle on if not selected
+                                }
+                            } else {
+                                selected.clear(); // Clear the existing selection
+                                selected.push(index); // Replace with the new selection
+                            }
+                        }
+
+                        on_click(&selected, cx);
                     })
-                    .collect()
-            } else {
-                self.children
-            })
+                },
+            )
     }
 }