diff --git a/src/features/study/ui/study-done-modal.tsx b/src/features/study/ui/study-done-modal.tsx
index 8d3698e4..6224f2d3 100644
--- a/src/features/study/ui/study-done-modal.tsx
+++ b/src/features/study/ui/study-done-modal.tsx
@@ -27,11 +27,13 @@ export default function StudyDoneModal({
 
   return (
     <Modal.Root open={isOpen} onOpenChange={setIsOpen}>
-      <Modal.Trigger>
-        <div className="rounded-100 bg-fill-brand-default-default font-designer-16b text-text-inverse hover:bg-fill-brand-default-hover cursor-pointer px-150 py-100">
-          완료하기
-        </div>
-      </Modal.Trigger>
+      <Button
+        disabled={data.progressStatus === 'PENDING'}
+        size="medium"
+        onClick={() => setIsOpen(true)}
+      >
+        완료하기
+      </Button>
 
       <Modal.Portal>
         <Modal.Overlay />
@@ -149,7 +151,7 @@ function StudyDoneForm({ data, studyDate, onClose }: StudyDoneFormProps) {
           <Button
             size="large"
             color={feedback.trim() && progressStatus ? 'primary' : 'secondary'}
-            disabled={!feedback.trim() || !progressStatus}
+            disabled={!feedback.trim() || isPending}
             onClick={handleSubmit}
           >
             작성 완료
diff --git a/src/features/study/ui/study-ready-modal.tsx b/src/features/study/ui/study-ready-modal.tsx
index 48bb1d72..2926eb22 100644
--- a/src/features/study/ui/study-ready-modal.tsx
+++ b/src/features/study/ui/study-ready-modal.tsx
@@ -21,10 +21,8 @@ export default function StudyReadyModal({
 
   return (
     <Modal.Root open={isOpen} onOpenChange={setIsOpen}>
-      <Modal.Trigger>
-        <div className="rounded-100 bg-fill-brand-default-default font-designer-16b text-text-inverse hover:bg-fill-brand-default-hover cursor-pointer px-150 py-100">
-          준비하기
-        </div>
+      <Modal.Trigger asChild>
+        <Button size="medium">준비하기</Button>
       </Modal.Trigger>
 
       <Modal.Portal>
@@ -136,7 +134,7 @@ function StudyReadyForm({ data, studyDate, onClose }: StudyReadyFormProps) {
           <Button
             size="large"
             color={subject.trim() ? 'primary' : 'secondary'}
-            disabled={!subject.trim()}
+            disabled={!subject.trim() || isPending}
             onClick={handleSubmit}
           >
             작성 완료