diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 717905eb90..6434c7710d 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -14,6 +14,7 @@
     notifications,
     Checkbox,
     DatePicker,
+    DrawerContent,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
   import { automationStore, selectedAutomation, tables } from "stores/builder"
@@ -442,15 +443,16 @@
               <Button cta slot="buttons" on:click={() => saveFilters(key)}>
                 Save
               </Button>
-              <FilterBuilder
-                slot="body"
-                {filters}
-                {bindings}
-                {schemaFields}
-                datasource={{ type: "table", tableId }}
-                panel={AutomationBindingPanel}
-                on:change={e => (tempFilters = e.detail)}
-              />
+              <DrawerContent slot="body">
+                <FilterBuilder
+                  {filters}
+                  {bindings}
+                  {schemaFields}
+                  datasource={{ type: "table", tableId }}
+                  panel={AutomationBindingPanel}
+                  on:change={e => (tempFilters = e.detail)}
+                />
+              </DrawerContent>
             </Drawer>
           {:else if value.customType === "password"}
             <Input
diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index e55a20ee0d..45b81f2a78 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -330,7 +330,7 @@
     grid-template-columns: 1fr 120px 1fr auto auto;
   }
   .fields.with-bindings {
-    grid-template-columns: 1fr 120px 1fr auto auto auto;
+    grid-template-columns: minmax(150px, 1fr) 170px 120px minmax(150px, 1fr) 16px 16px;
   }
 
   .controls {