diff --git a/src/entities/assignment/api/assignmentApi.ts b/src/entities/assignment/api/assignmentApi.ts
index 23940b5..e3af901 100644
--- a/src/entities/assignment/api/assignmentApi.ts
+++ b/src/entities/assignment/api/assignmentApi.ts
@@ -1,8 +1,55 @@
-import type {DashboardScheduleListResponse} from '@/entities/course/model/types';
+import type {
+  AssignmentSelectResponse,
+  DashboardScheduleListResponse,
+} from '@/entities/course/model/types';
 import {privateAxios} from '@/shared/api/axiosInstance';
+import type {ApiResponse} from '@/shared/model';
+import type {AssignmentsResponse} from '../model/types';
 
+// 과제 일정 조회 API
 export const getAssignmentSchedules =
   async (): Promise<DashboardScheduleListResponse> => {
     const response = await privateAxios.get('/assignments/schedule');
     return response.data;
   };
+
+// 전체 과제 목록 조회 API
+export const getAllAssignments = async (): Promise<
+  ApiResponse<AssignmentsResponse>
+> => {
+  const response = await privateAxios.get<
+    ApiResponse<{
+      count: number;
+      assignments: {assignmentId: number; title: string}[];
+    }>
+  >('/assignments/my');
+  const raw = response.data;
+  return {
+    ...raw,
+    response: {
+      count: raw.response.count,
+      assignments: raw.response.assignments.map(({assignmentId, title}) => ({
+        id: assignmentId,
+        title,
+      })),
+    },
+  };
+};
+
+// 강의별 과제 목록 조회 API
+export const getAssignmentsByCourse = async (
+  courseId: number
+): Promise<AssignmentSelectResponse> => {
+  const response = await privateAxios.get(`/courses/${courseId}/assignments`);
+
+  console.log('getAssignmentsByCourse API 응답:', response.data); // 응답 데이터 로깅
+  return response.data;
+};
+
+// 과제 삭제 API
+export const deleteAssignment = async (
+  assignmentId: number
+): Promise<ApiResponse<string>> => {
+  const response = await privateAxios.delete(`/assignments/${assignmentId}`);
+  return response.data;
+};
diff --git a/src/entities/assignment/api/assignmentQueries.ts b/src/entities/assignment/api/assignmentQueries.ts
new file mode 100644
index 0000000..d2554d8
--- /dev/null
+++ b/src/entities/assignment/api/assignmentQueries.ts
@@ -0,0 +1,30 @@
+import {queryOptions} from '@tanstack/react-query';
+import {
+  getAllAssignments,
+  getAssignmentsByCourse,
+  getAssignmentSchedules,
+} from './assignmentApi';
+
+export const assignmentQueries = {
+  // 과제 일정 조회 쿼리 옵션
+  getAssignmentSchedules: () =>
+    queryOptions({
+      queryKey: ['schedules'],
+      queryFn: getAssignmentSchedules,
+    }),
+
+  // 전체 과제 목록 조회 쿼리 옵션
+  getAllAssignments: () =>
+    queryOptions({
+      queryKey: ['assignments'],
+      queryFn: getAllAssignments,
+    }),
+
+  // 강의별 과제 목록 조회 쿼리 옵션
+  getAssignmentsByCourse: (courseId: number) =>
+    queryOptions({
+      queryKey: ['courses', courseId, 'assignments'],
+      queryFn: () => getAssignmentsByCourse(courseId),
+      enabled: !!courseId, // courseId가 있을 때만 쿼리 실행
+    }),
+};
diff --git a/src/entities/assignment/api/assignmentQueryOptions.ts b/src/entities/assignment/api/assignmentQueryOptions.ts
deleted file mode 100644
index 89af95e..0000000
--- a/src/entities/assignment/api/assignmentQueryOptions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {queryOptions} from '@tanstack/react-query';
-import {getAssignmentSchedules} from './assignmentApi';
-
-export default function assignmentQueryOptions() {
-  return queryOptions({
-    queryKey: ['schedules'],
-    queryFn: getAssignmentSchedules,
-  });
-}
diff --git a/src/entities/assignment/model/types.ts b/src/entities/assignment/model/types.ts
index 331c549..bdbf0a8 100644
--- a/src/entities/assignment/model/types.ts
+++ b/src/entities/assignment/model/types.ts
@@ -8,3 +8,8 @@ export interface Assignment {
   title: string;
   submittedStatus?: SubmissionStatus;
 }
+
+export interface AssignmentsResponse {
+  count: number;
+  assignments: Assignment[];
+}
diff --git a/src/entities/course/api/courseApi.ts b/src/entities/course/api/courseApi.ts
index deae300..a1afec0 100644
--- a/src/entities/course/api/courseApi.ts
+++ b/src/entities/course/api/courseApi.ts
@@ -2,11 +2,13 @@ import type {ApiResponse} from '@/shared/model/common';
 import type {DashboardCourseListResponse} from '@/entities/course/model/types';
 import {privateAxios} from '@/shared/api/axiosInstance';
 
+// 전체 강의 목록 조회 API
 export const getAllCourses = async (): Promise<DashboardCourseListResponse> => {
   const response = await privateAxios.get('/courses/my');
   return response.data;
 };
 
+// 강의 삭제 API
 export const deleteCourse = async (
   courseId: number
 ): Promise<ApiResponse<string>> => {
diff --git a/src/entities/course/api/courseMutations.ts b/src/entities/course/api/courseMutations.ts
new file mode 100644
index 0000000..0eea045
--- /dev/null
+++ b/src/entities/course/api/courseMutations.ts
@@ -0,0 +1,9 @@
+import {deleteCourse} from './courseApi';
+
+export const courseMutations = {
+  // 강의 삭제 뮤테이션 옵션
+  deleteCourse: {
+    mutationKey: ['deleteCourse'],
+    mutationFn: (courseId: number) => deleteCourse(courseId),
+  },
+};
diff --git a/src/entities/course/api/courseQueries.ts b/src/entities/course/api/courseQueries.ts
new file mode 100644
index 0000000..2999360
--- /dev/null
+++ b/src/entities/course/api/courseQueries.ts
@@ -0,0 +1,11 @@
+import {getAllCourses} from './courseApi';
+import {queryOptions} from '@tanstack/react-query';
+
+export const courseQueries = {
+  // 전체 강의 조회 쿼리 옵션
+  getAllCourses: () =>
+    queryOptions({
+      queryKey: ['courses'],
+      queryFn: getAllCourses,
+    }),
+};
diff --git a/src/entities/course/api/courseQueryOptions.ts b/src/entities/course/api/courseQueryOptions.ts
deleted file mode 100644
index ab5d82f..0000000
--- a/src/entities/course/api/courseQueryOptions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {getAllCourses} from './courseApi';
-import {queryOptions} from '@tanstack/react-query';
-
-export default function courseQueryOptions() {
-  return queryOptions({
-    queryKey: ['courses'],
-    queryFn: getAllCourses,
-  });
-}
diff --git a/src/entities/course/index.ts b/src/entities/course/index.ts
deleted file mode 100644
index 6b5cfff..0000000
--- a/src/entities/course/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {getAllCourses, deleteCourse} from './api/courseApi';
diff --git a/src/entities/unit/api/unitApi.ts b/src/entities/unit/api/unitApi.ts
index b716386..428720c 100644
--- a/src/entities/unit/api/unitApi.ts
+++ b/src/entities/unit/api/unitApi.ts
@@ -44,3 +44,14 @@ export const updateUnit = async (
   const response = await privateAxios.put(`/units/${unitId}`, unit);
   return response.data;
 };
+
+// 단원에 등록된 과제 삭제
+export const deleteAssignmentFromUnit = async (
+  unitId: number,
+  assignmentId: number
+): Promise<ApiResponse<string>> => {
+  const response = await privateAxios.delete(
+    `/units/${unitId}/assignments/${assignmentId}`
+  );
+  return response.data;
+};
diff --git a/src/entities/unit/api/unitMutations.ts b/src/entities/unit/api/unitMutations.ts
index a0e6c91..d114344 100644
--- a/src/entities/unit/api/unitMutations.ts
+++ b/src/entities/unit/api/unitMutations.ts
@@ -5,8 +5,13 @@ export const unitMutations = {
   // 단원 추가 뮤테이션 옵션
   createUnit: {
     mutationKey: ['createUnit'],
-    mutationFn: ({courseId, unit}: {courseId: number; unit: TUnitFormSchema}) =>
-      createUnit(courseId, unit),
+    mutationFn: ({
+      courseId,
+      unitForm,
+    }: {
+      courseId: number;
+      unitForm: TUnitFormSchema;
+    }) => createUnit(courseId, unitForm),
   },
 
   // 단원 수정 뮤테이션 옵션
diff --git a/src/entities/unit/model/useUnitStore.ts b/src/entities/unit/model/useUnitStore.ts
new file mode 100644
index 0000000..ea0def8
--- /dev/null
+++ b/src/entities/unit/model/useUnitStore.ts
@@ -0,0 +1,51 @@
+import type {Assignment} from '@/entities/assignment/model/types';
+import {create} from 'zustand';
+import {createJSONStorage, persist} from 'zustand/middleware';
+
+interface UnitState {
+  title: string;
+  releaseDate: string;
+  dueDate: string;
+  assignments: Assignment[];
+  storeFormData: (title: string, releaseDate: string, dueDate: string) => void;
+  resetStore: () => void;
+  setAssignments: (assignments: Assignment[]) => void;
+}
+
+export const useUnitStore = create<UnitState>()(
+  persist(
+    (set) => ({
+      title: '',
+      releaseDate: '',
+      dueDate: '',
+      assignments: [],
+
+      // 단원 폼 임시 저장
+      storeFormData: (title, releaseDate, dueDate) =>
+        set({
+          title: title,
+          releaseDate: releaseDate,
+          dueDate: dueDate,
+        }),
+
+      // 선택된 과제 ID 저장
+      setAssignments: (assignments) => set({assignments}),
+
+      // 단원 폼 초기화
+      resetStore: () =>
+        set({title: '', releaseDate: '', dueDate: '', assignments: []}),
+    }),
+    {
+      name: 'unit-session-storage',
+      storage: createJSONStorage(() => sessionStorage),
+      partialize: (state) => ({
+        title: state.title,
+        releaseDate: state.releaseDate,
+        dueDate: state.dueDate,
+        assignments: state.assignments,
+      }),
+    }
+  )
+);
+
+export default useUnitStore;
diff --git a/src/pages/dashboard/Dashboard.tsx b/src/pages/dashboard/Dashboard.tsx
index e1ca73a..d9acfd6 100644
--- a/src/pages/dashboard/Dashboard.tsx
+++ b/src/pages/dashboard/Dashboard.tsx
@@ -5,15 +5,15 @@ import AddIcon from '@/assets/svg/addIcon.svg?react';
 import ScheduleList from './ui/ScheduleList';
 import {Link} from 'react-router-dom';
 import {useUserStore} from '@/entities/auth/model/useUserStore';
-import courseQueryOptions from '@/entities/course/api/courseQueryOptions';
 import {
   useMutation,
   useQueryClient,
   useSuspenseQueries,
 } from '@tanstack/react-query';
-import assignmentQueryOptions from '@/entities/assignment/api/assignmentQueryOptions';
-import {deleteCourse} from '@/entities/course';
 import {EmptyState} from '@/shared/ui/EmptyState';
+import {courseQueries} from '@/entities/course/api/courseQueries';
+import {courseMutations} from '@/entities/course/api/courseMutations';
+import {assignmentQueries} from '@/entities/assignment/api/assignmentQueries';
 
 const Dashboard = () => {
   const userType = useUserStore((state) => state.userType);
@@ -21,19 +21,22 @@ const Dashboard = () => {
 
   // 강의 및 스케쥴 데이터 패칭
   const [{data: courses}, {data: schedules}] = useSuspenseQueries({
-    queries: [courseQueryOptions(), assignmentQueryOptions()],
+    queries: [
+      courseQueries.getAllCourses(),
+      assignmentQueries.getAssignmentSchedules(),
+    ],
   });
 
-  // 강의 삭제 뮤테이션
+  // 강의 삭제
   const {mutate} = useMutation({
-    mutationFn: (courseId: number) => deleteCourse(courseId),
+    ...courseMutations.deleteCourse,
     onSuccess: () => {
       // 강의 목록 및 스케쥴 목록 갱신
       queryClient.invalidateQueries({
-        queryKey: courseQueryOptions().queryKey,
+        queryKey: courseQueries.getAllCourses().queryKey,
       });
       queryClient.invalidateQueries({
-        queryKey: assignmentQueryOptions().queryKey,
+        queryKey: assignmentQueries.getAssignmentSchedules().queryKey,
       });
       alert('강의가 성공적으로 삭제되었습니다.');
     },
diff --git a/src/pages/select-assignment/AssignmentSelectPage.tsx b/src/pages/select-assignment/AssignmentSelectPage.tsx
index b84b174..e437970 100644
--- a/src/pages/select-assignment/AssignmentSelectPage.tsx
+++ b/src/pages/select-assignment/AssignmentSelectPage.tsx
@@ -1,35 +1,68 @@
 import AssignmentListContainer from './ui/AssignmentListContainer';
 import {useState} from 'react';
-import {
-  response,
-  courseOptionsResponse,
-} from '@/shared/mocks/assignmentSelectResponse';
 import {useCourseFilter} from '@/features/course/filter-course/lib/useCourseFilter';
 import {AssignmentPageLayout} from '@/widgets/assignment-page-layout';
 import ListRow from '@/shared/ui/list-row/ListRow';
+import {useQuery} from '@tanstack/react-query';
+import {courseQueries} from '@/entities/course/api/courseQueries';
+import {assignmentQueries} from '@/entities/assignment/api/assignmentQueries';
+import useUnitStore from '@/entities/unit/model/useUnitStore';
+import {useLocation, useNavigate} from 'react-router-dom';
+import type {Assignment} from '@/entities/assignment/model/types';
 
 const AssignmentSelectPage = () => {
-  const {courses} = courseOptionsResponse.response; // /courses/my API 응답 모킹
-  const [selectedAssignments, setSelectedAssignments] = useState<number[]>([]); // 선택된 문제 ID 목록
-
-  const {courseOptions, handleCourseSelect} = useCourseFilter(courses);
+  const navigate = useNavigate();
+  const location = useLocation();
+  const {data: courseList} = useQuery(courseQueries.getAllCourses());
+  const {setAssignments, assignments: currentSelectedAssignments} =
+    useUnitStore();
+  const [selectedAssignments, setSelectedAssignments] = useState<Assignment[]>(
+    currentSelectedAssignments ?? []
+  );
+  const {courseOptions, handleCourseSelect, selectedCourseId} = useCourseFilter(
+    courseList?.response.courses ?? []
+  );
+  const {data: allAssignments} = useQuery(
+    assignmentQueries.getAllAssignments()
+  );
+  const {data: assignments} = useQuery(
+    assignmentQueries.getAssignmentsByCourse(selectedCourseId ?? 0)
+  );
 
-  // 문제 목록 /courses/{courseId}/assignments API 응답 모킹
-  const assignmentList = response.response.courses.flatMap(
+  const filteredAssignments = assignments?.response.courses.flatMap(
     (course) => course.assignments
   );
 
+  // 선택된 강의에 따라 보여줄 과제 목록 결정
+  const assignmentList = selectedCourseId
+    ? (filteredAssignments ?? [])
+    : (allAssignments?.response.assignments ?? []);
+
   // 문제 선택 핸들러
-  const handleAssignmentSelect = (assignmentId: number) => {
+  const handleAssignmentSelect = (assignment: Assignment) => {
     setSelectedAssignments((prev) => {
-      if (prev.includes(assignmentId)) {
-        return prev.filter((id) => id !== assignmentId); // 선택 해제
-      } else {
-        return [...prev, assignmentId]; // 선택 추가
+      if (prev.some((a) => a.id === assignment.id)) {
+        return prev.filter((a) => a.id !== assignment.id);
       }
+      return [...prev, assignment];
     });
   };
 
+  const returnToPreviousPage = () => {
+    navigate(location.state?.backPath ?? -1, {
+      state: {
+        mode: location.state?.mode,
+        unitId: location.state?.unitId,
+        currentIndex: location.state?.currentIndex,
+      },
+    });
+  };
+
+  const handleConfirm = () => {
+    setAssignments(selectedAssignments);
+    returnToPreviousPage();
+  };
+
   return (
     <AssignmentPageLayout
       title='문제 선택'
@@ -43,13 +76,15 @@ const AssignmentSelectPage = () => {
           renderItem={(assignment) => (
             <ListRow
               title={assignment.title}
-              selected={selectedAssignments.includes(assignment.id)}
+              selected={selectedAssignments.some((a) => a.id === assignment.id)}
             />
           )}
         />
       }
-      onCancel={() => {}}
-      onConfirm={() => {}}
+      onCancel={() => {
+        returnToPreviousPage();
+      }}
+      onConfirm={handleConfirm}
     />
   );
 };
diff --git a/src/pages/select-assignment/ui/AssignmentListContainer.tsx b/src/pages/select-assignment/ui/AssignmentListContainer.tsx
index 94eb164..aa67777 100644
--- a/src/pages/select-assignment/ui/AssignmentListContainer.tsx
+++ b/src/pages/select-assignment/ui/AssignmentListContainer.tsx
@@ -1,3 +1,4 @@
+import type {Assignment} from '@/entities/assignment/model/types';
 import type {AssignmentSelectCourse} from '@/entities/course/model/types';
 
 type T = AssignmentSelectCourse['assignments'][number];
@@ -6,7 +7,7 @@ interface AssignmentListContainerProps<T> {
   items: T[];
   renderItem: (item: T) => React.ReactNode;
   title: string;
-  onSelect: (id: number) => void;
+  onSelect: (item: Assignment) => void;
 }
 
 const AssignmentListContainer = ({
@@ -15,16 +16,16 @@ const AssignmentListContainer = ({
   renderItem,
   title,
 }: AssignmentListContainerProps<T>) => {
-  const handleSelect = (id: number, event: React.MouseEvent) => {
+  const handleSelect = (item: Assignment, event: React.MouseEvent) => {
     event.stopPropagation();
-    onSelect(id);
+    onSelect(item);
   };
   return (
     <div className='custom-scrollbar'>
       <h3 className='text-lg/[27px] font-medium mb-4'>{title}</h3>
       <ul className='w-full flex flex-col pr-4 h-96 pb-5 overflow-y-auto gap-2.5'>
         {items.map((item) => (
-          <li onClick={(e) => handleSelect(item.id, e)} key={item.id}>
+          <li onClick={(e) => handleSelect(item, e)} key={item.id}>
             {renderItem(item)}
           </li>
         ))}
diff --git a/src/pages/unit-editor/UnitEditorPage.tsx b/src/pages/unit-editor/UnitEditorPage.tsx
index 1e632b9..616354a 100644
--- a/src/pages/unit-editor/UnitEditorPage.tsx
+++ b/src/pages/unit-editor/UnitEditorPage.tsx
@@ -2,13 +2,14 @@ import {UnitList} from './ui/UnitList';
 import {UnitForm} from './ui/UnitForm';
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
 import {unitQueries} from '@/entities/unit/api/unitQueries';
-import {useParams} from 'react-router-dom';
+import {useLocation, useParams} from 'react-router-dom';
 import {useEffect, useState} from 'react';
 import type {Mode} from './model/types';
 import {unitMutations} from '@/entities/unit/api/unitMutations';
 import type {TUnitFormSchema} from '@/entities/unit/model/types';
 import {EmptyState} from '@/shared/ui/EmptyState';
 import SurfaceCard from '@/shared/ui/SurfaceCard';
+import useUnitStore from '@/entities/unit/model/useUnitStore';
 
 const UnitEditorPage = () => {
   const {id} = useParams(); // 강의 ID
@@ -18,15 +19,24 @@ const UnitEditorPage = () => {
   const [currentIndex, setCurrentIndex] = useState<number>(1);
   const {data: unitList} = useQuery(unitQueries.getUnitList(courseId));
   const {data: unit} = useQuery(unitQueries.getUnitDetails(selectedUnitId));
+  const {state} = useLocation();
+  const {resetStore} = useUnitStore();
 
   useEffect(() => {
-    if (unitList && unitList?.response.count !== 0 && mode === 'idle') {
+    if (state?.mode && mode === 'idle') {
+      setMode(state.mode);
+      setSelectedUnitId(state.unitId);
+      setCurrentIndex(state.currentIndex ?? 1);
+      return;
+    }
+
+    if (unitList && unitList.response.count !== 0 && mode === 'idle') {
       setSelectedUnitId(unitList.response.units[0].id);
       setMode('editing'); // 편집 모드
-    } else if (unitList?.response.count === 0 && mode === 'idle') {
+    } else if (unitList && unitList.response.count === 0 && mode === 'idle') {
       setMode('creating'); // 생성 모드
     }
-  }, [unitList, mode]);
+  }, [unitList, mode, state]);
 
   const queryClient = useQueryClient();
   const invalidateUnitList = () => {
@@ -43,6 +53,7 @@ const UnitEditorPage = () => {
       invalidateUnitList();
       setSelectedUnitId(data.response.id);
       setMode('editing'); // 생성 후 편집 모드로 전환
+      resetStore(); // 단원 폼 초기화
       alert('새 단원이 성공적으로 생성되었습니다.');
     },
     onError: (error) => {
@@ -69,8 +80,8 @@ const UnitEditorPage = () => {
     ...unitMutations.deleteUnit,
     onSuccess: () => {
       invalidateUnitList();
-      setMode('idle'); // 삭제 후 대기 모드로 전환
       setSelectedUnitId(null); // 선택된 단원 초기화
+      setMode('creating');
       alert('단원이 성공적으로 삭제되었습니다.');
     },
     onError: (error) => {
@@ -93,8 +104,8 @@ const UnitEditorPage = () => {
   };
 
   // 단원 생성 핸들러
-  const onCreateUnit = (unit: TUnitFormSchema) => {
-    addUnit({courseId: courseId, unit});
+  const onCreateUnit = (unitForm: TUnitFormSchema) => {
+    addUnit({courseId, unitForm});
   };
 
   // 단원 업데이트 핸들러
diff --git a/src/pages/unit-editor/ui/UnitForm.tsx b/src/pages/unit-editor/ui/UnitForm.tsx
index 66cbec5..f50e178 100644
--- a/src/pages/unit-editor/ui/UnitForm.tsx
+++ b/src/pages/unit-editor/ui/UnitForm.tsx
@@ -7,11 +7,12 @@ import {zodResolver} from '@hookform/resolvers/zod';
 import {type UnitFormProps} from '../model/types';
 import AddIcon from '@/assets/svg/addIcon.svg?react';
 import {EmptyState} from '@/shared/ui/EmptyState';
-// import {useState} from 'react';
 import {
   unitFormSchema,
   type TUnitFormSchema,
 } from '@/entities/unit/model/types';
+import {useLocation, useNavigate} from 'react-router-dom';
+import useUnitStore from '@/entities/unit/model/useUnitStore';
 
 export const UnitForm = ({
   unit,
@@ -21,22 +22,34 @@ export const UnitForm = ({
   onUpdateUnit,
   onDeleteUnit,
 }: UnitFormProps) => {
-  // const [assignmentIds, setAssignmentIds] = useState<number[]>([]);
+  const location = useLocation();
+  const navigate = useNavigate();
+  const {
+    storeFormData,
+    resetStore,
+    title: storedTitle,
+    releaseDate: storedReleaseDate,
+    dueDate: storedDueDate,
+    assignments,
+  } = useUnitStore();
+
+  const assignmentIds = assignments.map((assignment) => assignment.id);
 
   const {
     register,
     handleSubmit,
     reset,
+    getValues,
     formState: {errors, isSubmitting},
   } = useForm<TUnitFormSchema>({
     resolver: zodResolver(unitFormSchema),
     values:
       mode === 'creating'
         ? {
-            title: '',
-            releaseDate: '',
-            dueDate: '',
-            assignmentIds: [],
+            title: storedTitle,
+            releaseDate: storedReleaseDate,
+            dueDate: storedDueDate,
+            assignmentIds: assignmentIds,
           }
         : {
             title: unit?.title || '',
@@ -64,9 +77,24 @@ export const UnitForm = ({
 
   // 단원 편집 취소 핸들러
   const handleCancel = () => {
+    resetStore(); // 폼 데이터 초기화
     reset();
   };
 
+  // 문제 선택 페이지로 이동 핸들러
+  const handleAssignmentSelect = () => {
+    const {title, releaseDate, dueDate} = getValues();
+    storeFormData(title, releaseDate, dueDate);
+    navigate('/admin/assignments/select', {
+      state: {
+        mode,
+        unitId: unit?.id ?? null,
+        currentIndex: unitIndex,
+        backPath: location.pathname,
+      },
+    });
+  };
+
   return (
     <div className='flex flex-col w-full h-full p-5'>
       {/* 단원 편집 폼 */}
@@ -124,17 +152,24 @@ export const UnitForm = ({
             <h4 className='text-base/6 font-medium'>문제 등록</h4>
 
             {/* 드래그 앤 드롭 가능한 문제 리스트 */}
-            {!unit || unit.assignmentCount === 0 ? (
+            {mode === 'editing' && unit && unit.assignmentCount > 0 ? (
+              <UnitAssignmentList assignmentList={unit.assignments} />
+            ) : assignments.length > 0 ? (
+              <UnitAssignmentList assignmentList={assignments} />
+            ) : (
               <EmptyState className='mt-4 mb-5'>
                 등록된 문제가 없습니다.
               </EmptyState>
-            ) : (
-              <UnitAssignmentList assignmentList={unit.assignments} />
             )}
 
             {/* 문제 연결 버튼 */}
             <div className='mt-3.5'>
-              <Button color='tonal' size='compact' content='mixed'>
+              <Button
+                onClick={handleAssignmentSelect}
+                color='tonal'
+                size='compact'
+                content='mixed'
+                disabled={mode === 'editing'}>
                 <AddIcon className='w-3 h-3' />
                 문제 연결
               </Button>
diff --git a/src/shared/ui/Layout.tsx b/src/shared/ui/Layout.tsx
index bf302a7..45913e5 100644
--- a/src/shared/ui/Layout.tsx
+++ b/src/shared/ui/Layout.tsx
@@ -9,7 +9,7 @@ const Layout = () => {
   const showHeader = !noHeaderPages.includes(pathname);
 
   return (
-    <div className='min-h-screen overflow-x-hidden flex-center'>
+    <div className='min-h-screen overflow-x-hidden flex justify-center'>
       <div className='min-w-289 px-4 py-12'>
         {showHeader && (
           <div className='w-289 pb-8 mx-auto'>