diff --git a/frontend/components/Course/InstructorQueuePage/FinishConfirmModal.tsx b/frontend/components/Course/InstructorQueuePage/FinishConfirmModal.tsx
index ba9cf712..fc2f08cc 100644
--- a/frontend/components/Course/InstructorQueuePage/FinishConfirmModal.tsx
+++ b/frontend/components/Course/InstructorQueuePage/FinishConfirmModal.tsx
@@ -10,7 +10,7 @@ const FinishConfirmModal = (props: FinishConfirmModalProps) => {
     const { onFinish, onClose, open } = props;
 
     return (
-        <Modal open={open}>
+        <Modal open={open} onClose={onClose}>
             <Modal.Header>Finish Confirmation</Modal.Header>
             <Modal.Content>
                 <Modal.Description>
diff --git a/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx b/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx
index 0737b6c6..a00f7a36 100644
--- a/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx
+++ b/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx
@@ -106,7 +106,7 @@ const QuestionCard = (props: QuestionCardProps) => {
             <FinishConfirmModal
                 open={finishConfirmModalOpen}
                 onFinish={() => handleFinish(true)}
-                onClose={() => setMessageModalOpen(false)}
+                onClose={() => setFinishConfirmModalOpen(false)}
             />
             <Segment attached="top" color="blue" clearing>
                 <div