diff --git a/app/components/app/tools/entry-form.vue b/app/components/app/tools/entry-form.vue
index 4354b36d..e3ae799e 100644
--- a/app/components/app/tools/entry-form.vue
+++ b/app/components/app/tools/entry-form.vue
@@ -76,13 +76,13 @@ function onCancelForm() {
       <Cell>
         <Label height="compact">Kode</Label>
         <Field :errMessage="errors.code">
-          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading" />
+          <Input id="code" v-model="code" v-bind="codeAttrs" :disabled="isLoading || isReadonly" />
         </Field>
       </Cell>
       <Cell>
         <Label height="compact">Nama</Label>
         <Field :errMessage="errors.name">
-          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading" />
+          <Input id="name" v-model="name" v-bind="nameAttrs" :disabled="isLoading || isReadonly" />
         </Field>
       </Cell>
       <Cell>
@@ -95,13 +95,13 @@ function onCancelForm() {
             v-model="uom"
             v-bind="uomAttrs"
             :items="uoms"
-            :disabled="isLoading"
+            :disabled="isLoading || isReadonly"
           />
         </Field>
       </Cell>
     </Block>
     <div class="my-2 flex justify-end gap-2 py-2">
-      <Button variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
+      <Button type="button" variant="secondary" class="w-[120px]" @click="onCancelForm"> Kembali </Button>
       <Button
         v-if="!isReadonly"
         type="button"
diff --git a/app/components/app/tools/list-cfg.ts b/app/components/app/tools/list-cfg.ts
index bed1689d..97bedbbd 100644
--- a/app/components/app/tools/list-cfg.ts
+++ b/app/components/app/tools/list-cfg.ts
@@ -14,7 +14,7 @@ const action = defineAsyncComponent(() => import('~/components/pub/custom-ui/dat
 
 export const cols: Col[] = [{ width: 100 }, { width: 250 }, { width: 100 }, { width: 50 }]
 
-export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Satuan' }]]
+export const header: Th[][] = [[{ label: 'Kode' }, { label: 'Nama' }, { label: 'Satuan' }, { label: '' }]]
 
 export const keys = ['code', 'name', 'uom_code', 'action']
 
@@ -28,10 +28,6 @@ export const funcParsed: Record<string, (row: any, ...args: any[]) => any> = {
     const recX = rec as SmallDetailDto
     return `${recX.name}`.trim()
   },
-  item_id: (rec: unknown): unknown => {
-    const recX = rec as SmallDetailDto
-    return recX.item_id
-  },
   uom_code: (rec: unknown): unknown => {
     const recX = rec as SmallDetailDto
     return recX.uom_code
diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index 158ceff6..f1139074 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -103,8 +103,8 @@ provide('rec_action', recAction)
 provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
-// Watch for row actions
-watch(recId, () => {
+// Watch for row actions when recId or recAction changes
+watch([recId, recAction], () => {
   switch (recAction.value) {
     case ActionEvents.showDetail:
       getEquipmentDetail(recId.value)
diff --git a/app/components/content/tools/list.vue b/app/components/content/tools/list.vue
index 4c82f224..89c379d5 100644
--- a/app/components/content/tools/list.vue
+++ b/app/components/content/tools/list.vue
@@ -8,7 +8,7 @@ import AppToolsEntryForm from '~/components/app/tools/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
 
 // helpers
-import { toast } from "~/components/pub/ui/toast"
+import { toast } from '~/components/pub/ui/toast'
 
 // Types
 import type { Uom } from '~/models/uom'
@@ -40,7 +40,6 @@ const getToolsDetail = async (id: number | string) => {
   if (result.success) {
     const currentDevice = result.body?.data || {}
     recItem.value = currentDevice
-    isFormEntryDialogOpen.value = true
   }
 }
 
@@ -104,17 +103,19 @@ provide('rec_item', recItem)
 provide('table_data_loader', isLoading)
 
 // Watch for row actions
-watch(recId, () => {
+watch([recId, recAction], () => {
   switch (recAction.value) {
     case ActionEvents.showDetail:
       getToolsDetail(recId.value)
       title.value = 'Detail Peralatan'
       isReadonly.value = true
+      isFormEntryDialogOpen.value = true
       break
     case ActionEvents.showEdit:
       getToolsDetail(recId.value)
       title.value = 'Edit Peralatan'
       isReadonly.value = false
+      isFormEntryDialogOpen.value = true
       break
     case ActionEvents.showConfirmDelete:
       isRecordConfirmationOpen.value = true
@@ -177,4 +178,4 @@ onMounted(async () => {
       </template>
     </RecordConfirmation>
   </div>
-</template>
\ No newline at end of file
+</template>