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 454c70b607..a7f1cf57c5 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
@@ -62,24 +62,35 @@
   <svelte:fragment slot="anchor" let:open>
     <ActionButton icon="MagicWand" selected={open}>Generate</ActionButton>
   </svelte:fragment>
-  <Menu>
-    <MenuItem
-      icon="ShareAndroid"
-      on:click={() => {
-        open = false
-        createAutomation(TriggerStepID.ROW_SAVED)
-      }}
-    >
-      Automation: when row is created
-    </MenuItem>
-    <MenuItem
-      icon="ShareAndroid"
-      on:click={() => {
-        open = false
-        createAutomation(TriggerStepID.ROW_UPDATED)
-      }}
-    >
-      Automation: when row is updated
-    </MenuItem>
-  </Menu>
+  <div class="menu">
+    <Menu>
+      <MenuItem
+        icon="ShareAndroid"
+        on:click={() => {
+          open = false
+          createAutomation(TriggerStepID.ROW_SAVED)
+        }}
+      >
+        Automation: when row is created
+      </MenuItem>
+      <MenuItem
+        icon="ShareAndroid"
+        on:click={() => {
+          open = false
+          createAutomation(TriggerStepID.ROW_UPDATED)
+        }}
+      >
+        Automation: when row is updated
+      </MenuItem>
+    </Menu>
+  </div>
 </DetailPopover>
+
+<style>
+  .menu {
+    margin: 0 calc(-1 * var(--spacing-xl));
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index 6c267c2733..50ad390b1c 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -128,9 +128,10 @@
       {/if}
       <GridExportButton />
     </svelte:fragment>
-
     <svelte:fragment slot="controls-right">
-      <GridGenerateButton bind:this={generateButton} />
+      {#if !isUsersTable}
+        <GridGenerateButton bind:this={generateButton} />
+      {/if}
     </svelte:fragment>
 
     <!-- Content for editing columns -->