diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index b95d0982d..d971dec09 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -44,11 +44,9 @@
                 v-for="team in list"
                 :key="team.id"
                 class="text-secondaryDark hover:bg-divider hover:cursor-pointer rounded-xl"
+                @click="goToTeamDetails(team.id)"
               >
-                <td
-                  @click="goToTeamDetails(team.id)"
-                  class="py-4 px-3 max-w-50"
-                >
+                <td class="py-4 px-3 max-w-50">
                   <div class="flex">
                     <span class="truncate">
                       {{ team.id }}
@@ -56,10 +54,7 @@
                   </div>
                 </td>
 
-                <td
-                  @click="goToTeamDetails(team.id)"
-                  class="py-4 px-3 min-w-80"
-                >
+                <td class="py-4 px-3 min-w-80">
                   <span
                     v-if="team.name"
                     class="flex items-center ml-4 truncate"
@@ -71,13 +66,13 @@
                   </span>
                 </td>
 
-                <td @click="goToTeamDetails(team.id)" class="py-4 px-3">
+                <td class="py-4 px-3">
                   <span class="ml-7">
                     {{ team.members?.length }}
                   </span>
                 </td>
 
-                <td>
+                <td @click.stop>
                   <div class="relative">
                     <tippy interactive trigger="click" theme="popover">
                       <HoppButtonSecondary
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index d230f274b..8bfff06bf 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -50,11 +50,9 @@
                 v-for="user in list"
                 :key="user.uid"
                 class="text-secondaryDark hover:bg-divider hover:cursor-pointer rounded-xl"
+                @click="goToUserDetails(user.uid)"
               >
-                <td
-                  @click="goToUserDetails(user.uid)"
-                  class="py-2 px-3 max-w-30"
-                >
+                <td class="py-2 px-3 max-w-30">
                   <div class="flex">
                     <span class="truncate">
                       {{ user.uid }}
@@ -62,7 +60,7 @@
                   </div>
                 </td>
 
-                <td @click="goToUserDetails(user.uid)" class="py-2 px-3">
+                <td class="py-2 px-3">
                   <div
                     v-if="user.displayName"
                     class="flex items-center space-x-3"
@@ -88,13 +86,13 @@
                   </div>
                 </td>
 
-                <td @click="goToUserDetails(user.uid)" class="py-2 px-3">
+                <td class="py-2 px-3">
                   <span>
                     {{ user.email }}
                   </span>
                 </td>
 
-                <td @click="goToUserDetails(user.uid)" class="py-2 px-3">
+                <td class="py-2 px-3">
                   <div class="flex items-center">
                     <div class="flex flex-col">
                       {{ getCreatedDate(user.createdOn) }}
@@ -105,7 +103,7 @@
                   </div>
                 </td>
 
-                <td>
+                <td @click.stop>
                   <div class="relative">
                     <span>
                       <tippy interactive trigger="click" theme="popover">