diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte
index c78611c950..63fd952026 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -22,7 +22,7 @@
   export let actions
   export let bindings = []
 
-  let showAvailableActions = false
+  $: showAvailableActions = !actions?.length
 
   let actionQuery
   $: parsedQuery =
@@ -114,12 +114,18 @@
 
 <DrawerContent>
   <Layout noPadding gap="S" slot="sidebar">
-    {#if showAvailableActions}
-      <div>
-        <ActionButton secondary icon={"ArrowLeft"} on:click={toggleActionList}>
-          Back
-        </ActionButton>
-      </div>
+    {#if showAvailableActions || !actions?.length}
+      {#if actions?.length > 0}
+        <div>
+          <ActionButton
+            secondary
+            icon={"ArrowLeft"}
+            on:click={toggleActionList}
+          >
+            Back
+          </ActionButton>
+        </div>
+      {/if}
       <Search placeholder="Search" bind:value={actionQuery} />
       {#each Object.entries(mappedActionTypes) as [categoryId, category]}
         <div class="heading">{categoryId}</div>