diff --git a/web/src/management/pages/edit/components/Pagination/PaginationWrapper.vue b/web/src/management/pages/edit/components/Pagination/PaginationWrapper.vue
index 020fcf16..e04ec33c 100644
--- a/web/src/management/pages/edit/components/Pagination/PaginationWrapper.vue
+++ b/web/src/management/pages/edit/components/Pagination/PaginationWrapper.vue
@@ -48,6 +48,7 @@ const props = defineProps({
 
 const editStore = useEditStore()
 const { pageCount, schema, newQuestionIndex } = storeToRefs(editStore)
+const { getSorter } = editStore
 
 const {
   updatePageEditOne,
@@ -82,7 +83,10 @@ const addPageControls = () => {
   updatePageEditOne(pageCount.value + 1)
   setCurrentEditOne(null)
   addQuestion({ question: newQuestion, index: newQuestionIndex.value })
-  setCurrentEditOne(newQuestionIndex.value)
+  setTimeout(() => {
+    const { endIndex } = getSorter();
+    setCurrentEditOne(endIndex - 1);
+  });
   addPage()
 }
 </script>
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 89c9cca3..8411b765 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 }">
@@ -52,8 +53,9 @@ import { useEditStore } from '@/management/stores/edit'
 import { ref } from 'vue'
 
 const editStore = useEditStore()
-const { newQuestionIndex } = storeToRefs(editStore)
-const { addQuestion, setCurrentEditOne, createNewQuestion } = editStore
+const { newQuestionIndex, schema } = storeToRefs(editStore)
+const { addQuestion, setCurrentEditOne, getSorter, createNewQuestion } = editStore
+
 
 const activeNames = ref([0, 1, 2])
 const previewImg = ref('')
@@ -65,10 +67,19 @@ questionLoader.init({
 })
 
 const onQuestionType = ({ type }) => {
-  const newQuestion = createNewQuestion({ type })
-  addQuestion({ question: newQuestion, index: newQuestionIndex.value })
-  setCurrentEditOne(newQuestionIndex.value)
-}
+  const newQuestion = createNewQuestion({ type });
+  addQuestion({ question: newQuestion, index: newQuestionIndex.value });
+  setTimeout(() => {
+    const { endIndex } = getSorter();
+    setCurrentEditOne(endIndex - 1);
+  });
+};
+
+const onDragEnd = (event) => {
+  const { startIndex } = getSorter();
+  setCurrentEditOne(schema.pageEditOne === 1 ? event.newIndex : startIndex + event.newIndex);
+};
+
 
 const showPreview = ({ snapshot }, id) => {
   previewImg.value = snapshot
diff --git a/web/src/management/stores/composables/usePageEdit.ts b/web/src/management/stores/composables/usePageEdit.ts
index d1758021..b82367bd 100644
--- a/web/src/management/stores/composables/usePageEdit.ts
+++ b/web/src/management/stores/composables/usePageEdit.ts
@@ -37,7 +37,7 @@ export default function usePageEdit(
   const getSorter = (index?: number) => {
     let startIndex = 0
     const newPageEditOne = index || pageEditOne.value
-    const endIndex = pageConf.value[newPageEditOne - 1]
+    const endIndex = newPageEditOne > pageConf.value.length ? 0 : pageConf.value[newPageEditOne - 1]
 
     for (let index = 0; index < pageConf.value.length; index++) {
       const item = pageConf.value[index]