diff --git a/src/modules/06_evaluate/components/ExpertPage.vue b/src/modules/06_evaluate/components/ExpertPage.vue
index cdf4bf9..8779d66 100644
--- a/src/modules/06_evaluate/components/ExpertPage.vue
+++ b/src/modules/06_evaluate/components/ExpertPage.vue
@@ -96,7 +96,7 @@ onMounted(() => {
             flat
             color="primary"
             class="q-mr-sm"
-            @click="router.go(-1)"
+            @click="router.push('/evaluate')"
           />
           <div>ประเมินเชี่ยวชาญ</div>
         </div>
diff --git a/src/modules/06_evaluate/views/EvaluateMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue
index 12e78be..6c44144 100644
--- a/src/modules/06_evaluate/views/EvaluateMain.vue
+++ b/src/modules/06_evaluate/views/EvaluateMain.vue
@@ -206,7 +206,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/')"
         />
         <div>ประเมินบุคคล</div>
       </div>
diff --git a/src/modules/07_appealComplain/views/Add.vue b/src/modules/07_appealComplain/views/Add.vue
index 7fe459d..52932a8 100644
--- a/src/modules/07_appealComplain/views/Add.vue
+++ b/src/modules/07_appealComplain/views/Add.vue
@@ -100,7 +100,7 @@ onMounted(() => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/appeal-complain')"
         />
         เพิ่มอุทธรณ์/ร้องทุกข์
       </div>
diff --git a/src/modules/10_registry/tabs/01_information.vue b/src/modules/10_registry/tabs/01_information.vue
index 5407e56..a56fa8c 100644
--- a/src/modules/10_registry/tabs/01_information.vue
+++ b/src/modules/10_registry/tabs/01_information.vue
@@ -23,7 +23,7 @@ const router = useRouter();
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/registry')"
       />
       <div>ข้อมูลส่วนตัว</div>
     </div>
diff --git a/src/modules/10_registry/tabs/02_government.vue b/src/modules/10_registry/tabs/02_government.vue
index 6fe38ab..cab0c4a 100644
--- a/src/modules/10_registry/tabs/02_government.vue
+++ b/src/modules/10_registry/tabs/02_government.vue
@@ -23,7 +23,7 @@ const router = useRouter();
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/registry')"
       />
       <div>ข้อมูลราชการ</div>
     </div>
diff --git a/src/modules/10_registry/tabs/03_salary.vue b/src/modules/10_registry/tabs/03_salary.vue
index ff34869..22a83ac 100644
--- a/src/modules/10_registry/tabs/03_salary.vue
+++ b/src/modules/10_registry/tabs/03_salary.vue
@@ -18,7 +18,7 @@ const router = useRouter();
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/registry')"
       />
       <div>ข้อมูลเงินเดือน/ค่าจ้าง</div>
     </div>
diff --git a/src/modules/10_registry/tabs/04_Achievement.vue b/src/modules/10_registry/tabs/04_Achievement.vue
index d5f9d67..74ee560 100644
--- a/src/modules/10_registry/tabs/04_Achievement.vue
+++ b/src/modules/10_registry/tabs/04_Achievement.vue
@@ -22,7 +22,7 @@ const router = useRouter();
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/registry')"
       />
       <div>ข้อมูลผลงานและเครื่องราชฯ</div>
     </div>
diff --git a/src/modules/10_registry/tabs/05_other.vue b/src/modules/10_registry/tabs/05_other.vue
index 7dde665..1d4f4e9 100644
--- a/src/modules/10_registry/tabs/05_other.vue
+++ b/src/modules/10_registry/tabs/05_other.vue
@@ -19,7 +19,7 @@ const router = useRouter();
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/registry')"
       />
       <div>เอกสารหลักฐานและอื่นๆ</div>
     </div>
diff --git a/src/modules/10_registry/views/requestEditDetail.vue b/src/modules/10_registry/views/requestEditDetail.vue
index 9c21f6f..4ad8548 100644
--- a/src/modules/10_registry/views/requestEditDetail.vue
+++ b/src/modules/10_registry/views/requestEditDetail.vue
@@ -140,7 +140,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/registry/request-edit')"
         />
         รายละเอียดคำร้องขอแก้ไขทะเบียนประวัติ
       </div>
diff --git a/src/modules/12_organization/views/main.vue b/src/modules/12_organization/views/main.vue
index 0986604..40a2cea 100644
--- a/src/modules/12_organization/views/main.vue
+++ b/src/modules/12_organization/views/main.vue
@@ -217,7 +217,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/')"
         />
         <div>แผนผังองค์กร</div>
       </div>
diff --git a/src/modules/13_portfolio/views/Add.vue b/src/modules/13_portfolio/views/Add.vue
index b18ab7e..ad0ed23 100644
--- a/src/modules/13_portfolio/views/Add.vue
+++ b/src/modules/13_portfolio/views/Add.vue
@@ -188,7 +188,7 @@ onMounted(() => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/portfolio')"
         />
         <div v-if="routeName == 'addTransfer'">เพิ่มเอกสาร/ผลงาน</div>
         <div v-else>รายละเอียดเอกสาร/ผลงาน</div>
diff --git a/src/modules/14_IDP/views/registry.vue b/src/modules/14_IDP/views/registry.vue
index c16a8fb..37eb522 100644
--- a/src/modules/14_IDP/views/registry.vue
+++ b/src/modules/14_IDP/views/registry.vue
@@ -328,7 +328,7 @@ onMounted(() => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/IDP')"
         />
         {{
           isEdit