diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 32e38803b3..0d4361954f 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -79,18 +79,18 @@
 
     table = $tables.list.find(table => table._id === tableId)
 
+    schemaFields = Object.entries(table?.schema ?? {})
+      .filter(entry => {
+        const [, field] = entry
+        return field.type !== "formula" && !field.autocolumn
+      })
+      .sort(([nameA], [nameB]) => {
+        return nameA < nameB ? -1 : 1
+      })
+
     if (table) {
       editableRow["tableId"] = tableId
 
-      schemaFields = Object.entries(table?.schema ?? {})
-        .filter(entry => {
-          const [, field] = entry
-          return field.type !== "formula" && !field.autocolumn
-        })
-        .sort(([nameA], [nameB]) => {
-          return nameA < nameB ? -1 : 1
-        })
-
       // Parse out any data not in the schema.
       for (const column in editableFields) {
         if (!Object.hasOwn(table?.schema, column)) {