diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index c9df8ca..bdaccfc 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -681,13 +681,18 @@ export function CustomFormBuilder() {
         description: d.label + (d.description ? ` — ${d.description}` : ""),
         kind: "custom" as const,
       })),
+      ...formFields.map((f) => ({
+        key: `{{field.${f.key}}}`,
+        description: `${f.label} (${f.type})`,
+        kind: "field" as const,
+      })),
     ];
     return all.filter(
       (v) =>
         v.key.toLowerCase().includes(search.toLowerCase()) ||
         v.description.toLowerCase().includes(search.toLowerCase()),
     );
-  }, [customDefs, search]);
+  }, [customDefs, formFields, search]);
 
   const filteredCases = useMemo(() => {
     const s = caseSearch.toLowerCase();