diff --git a/frontend/components/screen/EditModal.tsx b/frontend/components/screen/EditModal.tsx
index 0127af40..e55f46ea 100644
--- a/frontend/components/screen/EditModal.tsx
+++ b/frontend/components/screen/EditModal.tsx
@@ -679,7 +679,7 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
           (targetComponent as any)?.componentConfig?.columnName ||
           targetComponentId;
 
-        const currentFormData = groupData.length > 0 ? groupData[0] : formData;
+        const currentFormData = groupData.length > 0 ? { ...formData, ...groupData[0] } : formData;
         const targetValue = currentFormData[fieldKey];
 
         let isMatch = false;