diff --git a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
index 5f6eca0b13..4f94ac955e 100644
--- a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
@@ -39,6 +39,8 @@
   resizable={false}
   on:close
   on:open
+  on:mouseenter
+  on:mouseleave
 >
   <Menu>
     {#each buttons as button}
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
index cb2afbc000..5cc3aca19e 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
@@ -110,7 +110,7 @@
     <div class="generate-section__options">
       <div>
         <ListItem
-          title="CRUD app"
+          title="Table"
           icon="TableEdit"
           hoverable
           on:click={() => startScreenWizard(AutoScreenTypes.TABLE)}
diff --git a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
index 03f5f4644e..6602565c3e 100644
--- a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
+++ b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
@@ -100,8 +100,7 @@
                   offset={5}
                   size="S"
                   animate={false}
-                  on:open={() => selectedRows.set({ [row._id]: true })}
-                  on:close={() => selectedRows.set({})}
+                  on:mouseenter={() => ($hoveredRowId = row._id)}
                 />
               {:else}
                 {#each buttons as button}