diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index 02d89505d..3cdce4eb1 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -16,12 +16,13 @@
 </script>
 
 <div class="block-field">
-  <Select bind:value={value.queryId} extraThin secondary>
-    <option value="">Choose an option</option>
-    {#each $queries.list as query}
-      <option value={query._id}>{query.name}</option>
-    {/each}
-  </Select>
+  <Select
+    label="Query"
+    bind:value={value.queryId}
+    options={$queries.list}
+    getOptionValue={query => query._id}
+    getOptionLabel={query => query.name}
+  />
 </div>
 
 {#if parameters.length}