diff --git a/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue b/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
index e4d812be..b12e5e94 100644
--- a/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
+++ b/web/src/management/pages/edit/modules/questionModule/components/TypeList.vue
@@ -11,6 +11,7 @@
         :list="item.questionList"
         :group="{ name: DND_GROUP, pull: 'clone', put: false }"
         :clone="createNewQuestion"
+        @end="onDragEnd"
         item-key="path"
       >
         <template #item="{ element }">
@@ -53,7 +54,7 @@ import { ref } from 'vue'
 
 const editStore = useEditStore()
 const { newQuestionIndex } = storeToRefs(editStore)
-const { addQuestion, setCurrentEditOne, createNewQuestion } = editStore
+const { addQuestion, hasSetCurrentEditOne, createNewQuestion } = editStore
 
 const activeNames = ref([0, 1])
 const previewImg = ref('')
@@ -67,7 +68,11 @@ questionLoader.init({
 const onQuestionType = ({ type }) => {
   const newQuestion = createNewQuestion({ type })
   addQuestion({ question: newQuestion, index: newQuestionIndex.value })
-  setCurrentEditOne(newQuestionIndex.value)
+  hasSetCurrentEditOne(newQuestionIndex.value)
+}
+
+const onDragEnd = (event) => {  
+  hasSetCurrentEditOne(event.newIndex)
 }
 
 const showPreview = ({ snapshot }, id) => {
diff --git a/web/src/management/stores/edit.ts b/web/src/management/stores/edit.ts
index a95cd325..6ef10273 100644
--- a/web/src/management/stores/edit.ts
+++ b/web/src/management/stores/edit.ts
@@ -166,10 +166,16 @@ export const useEditStore = defineStore('edit', () => {
       if (!questCount) {
         return startIndex
       }
-      return endIndex
+      return endIndex - 1
     }
   })
 
+  const hasSetCurrentEditOne = (value: number) => {
+    if(!currentEditOne.value) {
+      setCurrentEditOne(value)
+    }
+  }
+
   // 题目操作：增删改
   const { copyQuestion, addQuestion, deleteQuestion, moveQuestion } = useQuestionData({
     questionDataList,
@@ -194,6 +200,7 @@ export const useEditStore = defineStore('edit', () => {
     currentEditMeta,
     newQuestionIndex,
     setCurrentEditOne,
+    hasSetCurrentEditOne,
     changeCurrentEditStatus,
 
     pageEditOne,