diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 2c6a10901..a22e8c3c8 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -833,6 +833,7 @@ watch(
                   ? `(${props.row.conditionReason})`
                   : ""
               }}
+
               <q-btn
                 v-if="props.row.positionIsSelected != 'ว่าง'"
                 size="12px"
@@ -843,7 +844,10 @@ watch(
                 round
                 @click="
                   (modalPerson = true),
-                    (personalId = props.row.current_holderId)
+                    (personalId =
+                      store.typeOrganizational === 'draft'
+                        ? props.row.next_holderId
+                        : props.row.current_holderId)
                 "
               >
                 <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>