diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
index 6ef86969ac..24b6042940 100644
--- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
@@ -29,6 +29,7 @@
 
   $: categories = Object.entries(groupBy("category", bindings))
   $: value && checkValid()
+  $: searchRgx = new RegExp(search, "ig")
 
   function onClickBinding(binding) {
     const position = getCaretPosition()
@@ -61,7 +62,7 @@
             <Heading extraSmall>{categoryName}</Heading>
             <Spacer extraSmall />
             {#each bindings.filter(binding =>
-              binding.label.startsWith(search)
+              binding.label.match(searchRgx)
             ) as binding}
               <div class="binding" on:click={() => onClickBinding(binding)}>
                 <span class="binding__label">{binding.label}</span>
@@ -75,9 +76,7 @@
           {/each}
           <Heading extraSmall>Helpers</Heading>
           <Spacer extraSmall />
-          {#each helpers.filter(binding =>
-            binding.label.startsWith(search)
-          ) as helper}
+          {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
             <div class="binding" on:click={() => onClickBinding(helper)}>
               <span class="binding__label">{helper.label}</span>
               <br />
diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index ae428ef763..47334267b6 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -29,6 +29,7 @@
   )
   $: dispatch("update", value)
   $: ({ instance, context } = groupBy("type", bindableProperties))
+  $: searchRgx = new RegExp(search, "ig")
 
   function checkValid() {
     // TODO: need to convert the value to the runtime binding
@@ -69,7 +70,7 @@
         <Spacer small />
         <ul>
           {#each context.filter(context =>
-            context.readableBinding.startsWith(search)
+            context.readableBinding.match(searchRgx)
           ) as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
               {readableBinding}
@@ -83,7 +84,7 @@
         <Spacer small />
         <ul>
           {#each instance.filter(instance =>
-            instance.readableBinding.startsWith(search)
+            instance.readableBinding.match(searchRgx)
           ) as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
               {readableBinding}
@@ -95,13 +96,13 @@
       <Heading extraSmall>Helpers</Heading>
       <Spacer small />
       <ul>
-        {#each helpers.filter(helper =>
-          helper.label.startsWith(search)
-        ) as helper}
+        {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
           <li on:click={() => addToText(helper.text)}>
             <div>
               <Label extraSmall>{helper.displayText}</Label>
-              <div class="description">{@html helper.description}</div>
+              <div class="description">
+                {@html helper.description}
+              </div>
             </div>
           </li>
         {/each}