diff --git a/src/components/ADempiere/Badge/index.vue b/src/components/ADempiere/Badge/index.vue
index f17293c8..b32b878a 100644
--- a/src/components/ADempiere/Badge/index.vue
+++ b/src/components/ADempiere/Badge/index.vue
@@ -8,7 +8,7 @@
       <el-table
         :data="getRecordNotification"
         :highlight-current-row="true"
-        @row-click="handleCurrentChange"
+        @cell-click="handleCurrentChange"
       >
         <el-table-column prop="name" :label="$t('navbar.badge.Notifications')" />
         <el-table-column
@@ -33,12 +33,11 @@
         </el-table-column>
         <el-table-column
           width="50"
+          class-name="procesActivity"
         >
-          <router-link :to="{ name: 'ProcessActivity' }">
-            <el-tooltip effect="dark" :content="$t('navbar.badge.link')" placement="top-start">
-              <svg-icon icon-class="tree-table" />
-            </el-tooltip>
-          </router-link>
+          <el-tooltip effect="dark" :content="$t('navbar.badge.link')" placement="top-start">
+            <svg-icon icon-class="tree-table" />
+          </el-tooltip>
         </el-table-column>
       </el-table>
       <el-button slot="reference" type="text" icon="el-icon-bell" style="float: left;color: #000000;font-size: 121%;font-weight: 615!important;padding-top: 14px;" />
@@ -75,7 +74,7 @@ export default {
     },
     handleCurrentChange(getRecordNotification, val, index, rows) {
       if (val !== null) {
-        if (getRecordNotification && getRecordNotification.isReport) {
+        if (getRecordNotification && getRecordNotification.isReport && val.className !== 'procesActivity') {
           this.$router.push({
             name: 'Report Viewer',
             params: {
diff --git a/src/views/ADempiere/ProcessActivity/index.vue b/src/views/ADempiere/ProcessActivity/index.vue
index 6e60fbd7..a9f3b305 100644
--- a/src/views/ADempiere/ProcessActivity/index.vue
+++ b/src/views/ADempiere/ProcessActivity/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="getRunProcessAll.length" class="app-container">
+  <div v-if="getRunProcessAll.length" key="with-process" class="app-container">
     <el-timeline>
       <el-timeline-item
         v-for="(activity, index) in getRunProcessAll"
@@ -39,7 +39,7 @@
               <!-- show only when it is error -->
               <el-popover
                 v-if="activity.isError && !activity.summary && !activity.isReport"
-                v-key="is-error"
+                :key="index + 'is-error'"
                 placement="right"
                 width="700"
                 trigger="hover"
@@ -54,6 +54,7 @@
               <!-- show only when bring logs -->
               <el-popover
                 v-else-if="activity.logsList.length > 0 || activity.summary"
+                :key="index + 'is-summary'"
                 placement="right"
                 width="500"
                 trigger="hover"
@@ -74,7 +75,7 @@
               <!-- show only when bring output -->
               <el-popover
                 v-else-if="activity.isReport"
-                v-key="is-output"
+                :key="index + 'is-output'"
                 placement="right"
                 width="700"
                 trigger="hover"
@@ -94,7 +95,7 @@
               </el-popover>
               <el-popover
                 v-else
-                v-key="is-other"
+                :key="index + 'is-other'"
                 placement="top-start"
                 :title="$t('table.ProcessActivity.Logs')"
                 width="200"
@@ -111,7 +112,7 @@
       </el-timeline-item>
     </el-timeline>
   </div>
-  <div v-else>
+  <div v-else key="without-process">
     <h1 class="text-center">{{ $t('views.noProcess') }}</h1>
   </div>
 </template>