diff --git a/src/pages/marking/grading.vue b/src/pages/marking/grading.vue
index 0b57355..b13bd0a 100644
--- a/src/pages/marking/grading.vue
+++ b/src/pages/marking/grading.vue
@@ -211,6 +211,14 @@ const currentQuestions = computed(() => questionsList.value[currentQuestionIndex
 const currentQuestion = computed(() => questions.value[0])
 const currentTask = computed(() => currentQuestions.value?.tasks?.[taskType.value])
 
+let isFirst = true
+whenever(questionsList, () => {
+  if (isFirst) {
+    isFirst = false
+    currentQuestionIndex.value = questionsList.value.findIndex(q => q.question_id === questionId.value)
+  }
+})
+
 const queryClient = useQueryClient()
 whenever(currentTask, (task, oldTask) => {
   taskId.value = task?.id
@@ -265,18 +273,17 @@ function handleQuickScoreSelect(score: number) {
     <!-- 打分设置弹窗 -->
     <ScoreSettingsDialog
       v-model="showScoreSettings"
-      :full-score="currentQuestion?.full_score"
+      :full-score="currentQuestions?.full_score"
       @confirm="handleScoreSettingsConfirm"
     />
 
     <!-- 查看均分弹窗 -->
     <AvgScoreDialog
-      v-if="currentQuestion"
       v-model="showAvgScore"
       :my-score="myScore"
       :avg-score="avgScore"
-      :question-title="`${currentQuestion?.question_major}.${currentQuestion?.question_minor}`"
-      :full-score="currentQuestion?.full_score"
+      :question-title="`${currentQuestions?.question_major}.${currentQuestions?.question_minor}`"
+      :full-score="currentQuestions?.full_score"
       :avg-score-data="markingData.avgScoreData.value"
     />