diff --git a/frontend/src/components/TaskModal.jsx b/frontend/src/components/TaskModal.jsx
index 04d71fe..a54153d 100644
--- a/frontend/src/components/TaskModal.jsx
+++ b/frontend/src/components/TaskModal.jsx
@@ -4,54 +4,84 @@ import { postAssignment, putAssignment } from "../api/managetask";
 
 const TaskModal = ({ weekInfo, onClose, onSubmit }) => {
   const [topic, setTopic] = useState("");
-  const [day, setDay] = useState("");
-  const [taskList, setTaskList] = useState([""]);
+  const [taskGroups, setTaskGroups] = useState([]);
 
   useEffect(() => {
     if (weekInfo?.tasks?.length > 0) {
-      const firstTask = weekInfo.tasks[0];
-      setTopic(firstTask.subtitle || "");
-      setDay(firstTask.day || "");
-      setTaskList(weekInfo.tasks.map((task) => task.assignmentName));
+      setTopic(weekInfo.tasks[0].subtitle || "");
+
+      // day별로 그룹화
+      const dayMap = new Map();
+      weekInfo.tasks.forEach((task) => {
+        if (!dayMap.has(task.day)) {
+          dayMap.set(task.day, []);
+        }
+        dayMap.get(task.day).push(task);
+      });
+
+      const grouped = Array.from(dayMap.entries()).map(([day, tasks]) => ({
+        day,
+        assignments: tasks.map((t) => t.assignmentName).slice(0, 3),
+        ids: tasks.map((t) => t.id),
+      }));
+
+      setTaskGroups(grouped);
+    } else {
+      // 초기값
+      setTaskGroups([{ day: "", assignments: ["", "", ""], ids: [] }]);
     }
   }, [weekInfo]);
 
-  const handleTaskChange = (index, value) => {
-    const newTasks = [...taskList];
-    newTasks[index] = value;
-    setTaskList(newTasks);
+  const handleDayChange = (index, value) => {
+    const updated = [...taskGroups];
+    updated[index].day = value;
+    setTaskGroups(updated);
   };
 
-  const handleAddTask = () => {
-    setTaskList([...taskList, ""]);
+  const handleAssignmentChange = (groupIndex, assignmentIndex, value) => {
+    const updated = [...taskGroups];
+    updated[groupIndex].assignments[assignmentIndex] = value;
+    setTaskGroups(updated);
   };
+
+  const handleAddGroup = () => {
+    setTaskGroups([
+      ...taskGroups,
+      { day: "", assignments: ["", "", ""], ids: [] },
+    ]);
+  };
+
   const handleSave = async () => {
-    const weekNumber = parseInt(weekInfo.week.replace("주차", ""));
-    const filteredTasks = taskList.filter((t) => t.trim() !== "");
-
-    const newTasks = filteredTasks.map((task, index) => ({
-      title: topic,
-      subtitle: topic,
-      assignmentName: task,
-      week: weekNumber,
-      day: day,
-      orderNumber: index + 1,
-    }));
-
-    const requests = newTasks.map((payload, index) => {
-      const existingTask = weekInfo.tasks[index];
-      return existingTask?.id
-        ? putAssignment(existingTask.id, payload)
-        : postAssignment(payload);
+    const weekNumber = parseInt(weekInfo.week.replace("주차", ""), 10);
+    const newTasks = [];
+
+    taskGroups.forEach((group, groupIndex) => {
+      group.assignments.forEach((assignmentName, i) => {
+        if (assignmentName.trim() !== "") {
+          newTasks.push({
+            title: topic,
+            subtitle: topic,
+            assignmentName,
+            week: weekNumber,
+            day: group.day,
+            orderNumber: i + 1,
+            id: group.ids?.[i] ?? null,
+          });
+        }
+      });
     });
 
+    const requests = newTasks.map((task) =>
+      task.id ? putAssignment(task.id, task) : postAssignment(task)
+    );
+
     try {
       await Promise.all(requests);
       alert("과제가 저장되었습니다.");
       onSubmit && onSubmit(newTasks);
       onClose();
-    } catch (error) {
-      console.error("저장 오류:", error);
+    } catch (err) {
+      console.error("저장 오류:", err);
       alert("과제 저장 중 오류가 발생했습니다.");
     }
   };
@@ -65,6 +95,7 @@ const TaskModal = ({ weekInfo, onClose, onSubmit }) => {
             ×
           </button>
         </div>
+
         <div className={styles.modal_body}>
           <label>주제:</label>
           <input
@@ -72,25 +103,36 @@ const TaskModal = ({ weekInfo, onClose, onSubmit }) => {
             value={topic}
             onChange={(e) => setTopic(e.target.value)}
           />
-          <label>요일:</label>
-          <input
-            placeholder="요일을 입력하세요."
-            value={day}
-            onChange={(e) => setDay(e.target.value)}
-          />
-          <label>과제:</label>
-          {taskList.map((task, i) => (
-            <input
-              key={i}
-              placeholder="과제를 입력하세요."
-              value={task}
-              onChange={(e) => handleTaskChange(i, e.target.value)}
-            />
+
+          {taskGroups.map((group, groupIdx) => (
+            <div key={groupIdx} className={styles.day_group}>
+              <label>요일:</label>
+              <input
+                placeholder="요일 입력"
+                value={group.day}
+                onChange={(e) => handleDayChange(groupIdx, e.target.value)}
+              />
+              <label>과제:</label>
+              <div className={styles.assignment_inputs}>
+                {group.assignments.map((assignment, i) => (
+                  <input
+                    key={i}
+                    placeholder={`과제 ${i + 1}`}
+                    value={assignment}
+                    onChange={(e) =>
+                      handleAssignmentChange(groupIdx, i, e.target.value)
+                    }
+                  />
+                ))}
+              </div>
+            </div>
           ))}
-          <button onClick={handleAddTask} className={styles.add_button}>
+
+          <button onClick={handleAddGroup} className={styles.add_button}>
             +
           </button>
         </div>
+
         <div className={styles.modal_footer}>
           <button className={styles.save_button} onClick={handleSave}>
             save