diff --git a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
index 42e2451ad4..5f6eca0b13 100644
--- a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
@@ -26,6 +26,7 @@
   icon="ChevronDown"
   cta
   on:click={() => popover?.show()}
+  on:click
 >
   {text || "Action"}
 </Button>
@@ -36,6 +37,8 @@
   {offset}
   {animate}
   resizable={false}
+  on:close
+  on:open
 >
   <Menu>
     {#each buttons as button}
diff --git a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
index 4ec1fd6879..a086972941 100644
--- a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
+++ b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
@@ -92,6 +92,8 @@
                   offset={5}
                   size="S"
                   animate={false}
+                  on:open={() => selectedRows.set({ [row._id]: true })}
+                  on:close={() => selectedRows.set({})}
                 />
               {:else}
                 {#each buttons as button}