diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index d891614..e3c993b 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -676,11 +676,17 @@ export function CustomFormBuilder() {
     if (selectedCaseId) {
       customValues = await fetchCaseCustomValues(selectedCaseId);
     }
+    // Always re-fetch the latest client custom values at render time so edits
+    // made in another tab show up without needing to reselect the client.
+    const freshClientCustomValues = client?.id
+      ? await fetchClientCustomValues(client.id)
+      : {};
     return {
       client,
       homeowner,
       firmName: firm?.company_name ?? "",
       customValues,
+      clientCustomValues: freshClientCustomValues,
       fieldValues,
     };
   };