diff --git a/src/components/button-group/button-group.stories.tsx b/src/components/button-group/button-group.stories.tsx
new file mode 100644
index 00000000..86d965d5
--- /dev/null
+++ b/src/components/button-group/button-group.stories.tsx
@@ -0,0 +1,34 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import React from "react";
+import { ButtonGroup } from "./button-group";
+
+const meta: Meta<typeof ButtonGroup> = {
+    title: "ButtonGroup",
+    component: ButtonGroup,
+    parameters: {
+        options: {
+            showPanel: false,
+        },
+    },
+};
+
+export default meta;
+type Story = StoryObj<typeof ButtonGroup>;
+
+export const Default: Story = {
+    render: () => (
+        <ButtonGroup>
+            <ButtonGroup.Button type="button">Normal</ButtonGroup.Button>
+            <ButtonGroup.Button type="button" disabled>
+                Disabled
+            </ButtonGroup.Button>
+            <ButtonGroup.Button type="button" isActive>
+                Active
+            </ButtonGroup.Button>
+            <ButtonGroup.Button type="button" isActive disabled>
+                Active & Disabled
+            </ButtonGroup.Button>
+            <ButtonGroup.Button type="button">Button 1</ButtonGroup.Button>
+        </ButtonGroup>
+    ),
+};
diff --git a/src/components/button-group/button-group.tsx b/src/components/button-group/button-group.tsx
new file mode 100644
index 00000000..db983eb7
--- /dev/null
+++ b/src/components/button-group/button-group.tsx
@@ -0,0 +1,42 @@
+import React from "react";
+import { classNames } from "../../util/class-names";
+
+interface ButtonProps extends React.ComponentPropsWithoutRef<"button"> {
+    children?: React.ReactNode;
+    type: "button" | "submit" | "reset";
+    isActive?: boolean;
+}
+
+const Button = ({ children, type, isActive, ...props }: ButtonProps) => {
+    return (
+        <button
+            data-slot="group-button"
+            // eslint-disable-next-line react/button-has-type
+            type={type}
+            className={classNames(
+                "relative -ml-px inline-flex bg-neutral-0 px-4 py-2 text-xs text-neutral-700  ring-1 ring-inset ring-neutral-400 hover:bg-neutral-100 hover:text-neutral-800 focus:z-10 focus:outline focus:outline-2 focus:outline-offset-0 focus:outline-primary-200 active:bg-neutral-200 disabled:bg-neutral-0 disabled:text-neutral-500",
+                isActive &&
+                    "bg-primary-50 text-primary-500 hover:bg-primary-50 hover:text-primary-500 active:bg-primary-50 disabled:bg-neutral-100 disabled:text-neutral-500"
+            )}
+            {...props}
+        >
+            {children}
+        </button>
+    );
+};
+
+interface ButtonGroupProps {
+    children?: React.ReactNode;
+}
+
+const ButtonGroup = ({ children }: ButtonGroupProps) => {
+    return (
+        <div className="isolate inline-flex [&>[data-slot=group-button]:first-of-type]:ml-0 [&>[data-slot=group-button]:first-of-type]:rounded-l  [&>[data-slot=group-button]:last-of-type]:rounded-r">
+            {children}
+        </div>
+    );
+};
+
+ButtonGroup.Button = Button;
+
+export { ButtonGroup };
diff --git a/src/components/button-group/index.tsx b/src/components/button-group/index.tsx
new file mode 100644
index 00000000..4f0b2848
--- /dev/null
+++ b/src/components/button-group/index.tsx
@@ -0,0 +1 @@
+export { ButtonGroup } from "./button-group";
diff --git a/src/components/index.ts b/src/components/index.ts
index 127369c9..e715c11c 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -29,3 +29,4 @@ export { Toggle } from "./toggle";
 export { Tooltip } from "./tooltip";
 export { TopBar } from "./top-bar";
 export { Disclosure } from "./disclosure";
+export { ButtonGroup } from "./button-group";