diff --git a/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldEntry.tsx b/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldEntry.tsx
index 010230677..17a12797c 100644
--- a/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldEntry.tsx
+++ b/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldEntry.tsx
@@ -39,6 +39,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
             initialColour={colour}
             initialLabel={label}
             initialKey={fieldKey}
+            initialType={type}
           />
         </td>
       </tr>
diff --git a/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldForm.tsx b/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldForm.tsx
index f5a27d852..01387ec2e 100644
--- a/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldForm.tsx
+++ b/apps/client/src/features/app-settings/panel/manage-panel/composite/CustomFieldForm.tsx
@@ -21,6 +21,7 @@ interface CustomFieldsFormProps {
   initialColour?: string;
   initialLabel?: string;
   initialKey?: string;
+  initialType?: CustomField['type'];
 }
 
 type CustomFieldFormData = CustomField & { key: string };
@@ -31,6 +32,7 @@ export default function CustomFieldForm({
   initialColour,
   initialLabel,
   initialKey,
+  initialType,
 }: CustomFieldsFormProps) {
   const { data } = useCustomFields();
 
@@ -47,7 +49,7 @@ export default function CustomFieldForm({
     watch,
     formState: { errors, isSubmitting, isValid, isDirty },
   } = useForm<CustomFieldFormData>({
-    defaultValues: { type: 'text', label: initialLabel || '', colour: initialColour || '' },
+    defaultValues: { type: initialType ?? 'text', label: initialLabel || '', colour: initialColour || '' },
     resetOptions: {
       keepDirtyValues: true,
     },