diff --git a/src/components/ADempiere/ContainerOptions/LockRecord/index.vue b/src/components/ADempiere/ContainerOptions/LockRecord/index.vue
index c34086bf..5a9d6cae 100644
--- a/src/components/ADempiere/ContainerOptions/LockRecord/index.vue
+++ b/src/components/ADempiere/ContainerOptions/LockRecord/index.vue
@@ -17,29 +17,28 @@
 -->
 
 <template>
-  <div>
-    <span v-if="isFirstTab" key="tooltip">
-      <el-tooltip
-        v-if="isFirstTab"
-        :content="isLocked ? $t('data.lockRecord') : $t('data.unlockRecord')"
-        placement="top"
-      >
-        <el-button type="text" @click="lockRecord()">
-          <i
-            :class="isLocked ? 'el-icon-lock' : 'el-icon-unlock'"
-            style="font-size: 15px; color: black;"
-          />
-        </el-button>
-      </el-tooltip>
-      <span :style="isLocked ? 'color: red;' :'color: #1890ff;'">
-        {{ tabName }}
-      </span>
-    </span>
+  <span v-if="isFirstTab" key="withTooltip">
+    <el-tooltip
+      v-if="isFirstTab"
+      :content="isLocked ? $t('data.lockRecord') : $t('data.unlockRecord')"
+      placement="top"
+    >
+      <el-button type="text" @click="lockRecord()">
+        <i
+          :class="isLocked ? 'el-icon-lock' : 'el-icon-unlock'"
+          style="font-size: 15px; color: black;"
+        />
+      </el-button>
+    </el-tooltip>
 
-    <template v-else>
+    <span :style="isLocked ? 'color: red;' :'color: #1890ff;'">
       {{ tabName }}
-    </template>
-  </div>
+    </span>
+  </span>
+
+  <span v-else key="onlyName">
+    {{ tabName }}
+  </span>
 </template>
 
 <script>
@@ -49,6 +48,10 @@ export default defineComponent({
   name: 'LockRecord',
 
   props: {
+    tabUuid: {
+      type: String,
+      required: true
+    },
     tabPosition: {
       type: Number,
       default: 0
@@ -56,12 +59,16 @@ export default defineComponent({
     tabName: {
       type: String,
       required: true
+    },
+    tableName: {
+      type: String,
+      required: true
     }
   },
 
   setup(props, { root }) {
-    const { tabUuid: containerUuid } = root.$route.meta
-    const { tableName } = root.$route.params
+    const containerUuid = props.tabUuid
+    const tableName = props.tableName
 
     const isFirstTab = computed(() => {
       return props.tabPosition === 0
diff --git a/src/components/ADempiere/Tab/index.vue b/src/components/ADempiere/Tab/index.vue
index d8180cd5..884e24fa 100644
--- a/src/components/ADempiere/Tab/index.vue
+++ b/src/components/ADempiere/Tab/index.vue
@@ -28,12 +28,13 @@
         :disabled="Boolean(key > 0 && isCreateNew)"
         :style="tabParentStyle"
       >
-        <span slot="label">
-          <lock-record
-            :tab-position="key"
-            :tab-name="tabAttributes.name"
-          />
-        </span>
+        <lock-record
+          slot="label"
+          :tab-position="key"
+          :tab-uuid="tabAttributes.uuid"
+          :table-name="tabAttributes.tableName"
+          :tab-name="tabAttributes.name"
+        />
 
         <main-panel
           :parent-uuid="windowUuid"