diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6fcc574d3b..501a25ed1c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -42,7 +42,7 @@
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
     "@spectrum-css/button": "^3.0.1",
-    "@spectrum-css/buttongroup": "^3.0.1",
+    "@spectrum-css/buttongroup": "^3.0.2",
     "@spectrum-css/checkbox": "^3.0.2",
     "@spectrum-css/dialog": "^3.0.1",
     "@spectrum-css/divider": "^1.0.1",
diff --git a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
index 9f3cacd630..51055363a2 100644
--- a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
@@ -1,7 +1,15 @@
 <script>
+    import "@spectrum-css/buttongroup/dist/index-vars.css"
     export let vertical = false
+
+    function group(element) {
+        const buttons = Array.from(element.getElementsByTagName('button'))
+        buttons.forEach(button => {
+            button.classList.add('spectrum-ButtonGroup-item')
+        })
+    }
 </script>
 
-<div class="spectrum-ButtonGroup" class:spectrum-ButtonGroup--vertical={vertical}>
+<div use:group class="spectrum-ButtonGroup" class:spectrum-ButtonGroup--vertical={vertical}>
     <slot />
 </div>
\ No newline at end of file
diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index cca9721492..80eeb3ebba 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -89,7 +89,7 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.2.tgz#387712641457d3045bcecf77e13854dd59e9c20e"
   integrity sha512-sUJuYrrmIL0RCkQpTQ9B5AdoWlu4Y6JatrcOB/OOwdzLbQ9bHw1bHj/y0Ua67hEtLOTjODU+2e5K3UM3KGnMTA==
 
-"@spectrum-css/buttongroup@^3.0.1":
+"@spectrum-css/buttongroup@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8"
   integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw==