diff --git a/src/Button/Button.Story.svelte b/src/Button/Button.Story.svelte
index 3786864b..aa34d074 100644
--- a/src/Button/Button.Story.svelte
+++ b/src/Button/Button.Story.svelte
@@ -3,6 +3,7 @@
 
   import Button from "./Button.svelte";
   import ButtonSkeleton from "./Button.Skeleton.svelte";
+  import ButtonSet from "./ButtonSet.svelte";
   import Add16 from "carbon-icons-svelte/lib/Add16";
 
   const {
@@ -12,7 +13,7 @@
     iconDescription,
     small,
     tooltipPosition,
-    tooltipAlignment
+    tooltipAlignment,
   } = $$props;
 
   const regularProps = {
@@ -20,7 +21,7 @@
     disabled,
     size,
     iconDescription,
-    small
+    small,
   };
 
   const iconOnlyProps = {
@@ -31,7 +32,7 @@
     icon: Add16,
     iconDescription,
     tooltipPosition,
-    tooltipAlignment
+    tooltipAlignment,
   };
 
   const setProps = { disabled, small, size, iconDescription };
@@ -49,10 +50,11 @@
   {:else if story === 'icon-only buttons'}
     <Button {...iconOnlyProps} />
   {:else if story === 'set of buttons'}
-    <div class="bx--btn-set">
+    <ButtonSet>
+      <Button kind="ghost" {...setProps}>Ghost button</Button>
       <Button kind="secondary" {...setProps}>Secondary button</Button>
       <Button kind="primary" {...setProps}>Primary button</Button>
-    </div>
+    </ButtonSet>
   {:else}
     <Button {...regularProps}>Button</Button>
     &nbsp;
diff --git a/src/Button/ButtonSet.svelte b/src/Button/ButtonSet.svelte
new file mode 100644
index 00000000..0d605888
--- /dev/null
+++ b/src/Button/ButtonSet.svelte
@@ -0,0 +1,3 @@
+<div class:bx--btn-set={true} {...$$restProps}>
+  <slot />
+</div>
diff --git a/src/Button/index.js b/src/Button/index.js
index f87e835f..731d8c0a 100644
--- a/src/Button/index.js
+++ b/src/Button/index.js
@@ -1,2 +1,3 @@
 export { default as Button } from "./Button.svelte";
 export { default as ButtonSkeleton } from "./Button.Skeleton.svelte";
+export { default as ButtonSet } from "./ButtonSet.svelte";
diff --git a/src/index.js b/src/index.js
index 5c0bc09f..6ccef095 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 export { Accordion, AccordionItem, AccordionSkeleton } from "./Accordion";
 export { Breadcrumb, BreadcrumbItem, BreadcrumbSkeleton } from "./Breadcrumb";
-export { Button, ButtonSkeleton } from "./Button";
+export { Button, ButtonSkeleton, ButtonSet } from "./Button";
 export { Checkbox, CheckboxSkeleton } from "./Checkbox";
 export { ContentSwitcher, Switch } from "./ContentSwitcher";
 export { Copy } from "./Copy";