diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
index 383d5bd935..02a8772da5 100644
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ b/packages/nc-gui/components/dashboard/TreeView.vue
@@ -581,17 +581,22 @@ const setIcon = async (icon: string, table: TableType) => {
                 >
                   <LazyDashboardTreeViewTableEntry
                     v-for="(table, idx) of tables.filter((table) => table.base_id === bases[0].id)"
-                    :key="idx"
+                    :key="table.id"
                     v-model="tables[idx]"
-                    :class="[
+                    v-e="['a:table:open']"
+                    <!-- :class="[
                       { hidden: !filteredTables?.includes(table), active: activeTable === table.id },
                       `nc-project-tree-tbl nc-project-tree-tbl-${table.title}`,
-                    ]"
+                    ]" -->
+                    :data-order="table.order"
+                    :data-id="table.id"
+                    :data-testid="`tree-view-table-${table.title}`"
                     :set-menu-context="setMenuContext"
                     :icon="icon"
                     :set-icon="setIcon"
                     :active-table="activeTable"
                     :open-rename-table-dialog="openRenameTableDialog"
+                    :addTableTab="addTableTab"
                   />
                 </div>
               </div>
diff --git a/packages/nc-gui/components/dashboard/TreeViewTableEntry.vue b/packages/nc-gui/components/dashboard/TreeViewTableEntry.vue
index 5145a86502..478694cd2f 100644
--- a/packages/nc-gui/components/dashboard/TreeViewTableEntry.vue
+++ b/packages/nc-gui/components/dashboard/TreeViewTableEntry.vue
@@ -12,6 +12,7 @@ const props = defineProps<{
   setIcon: (icon: string, table: TableType) => Promise<void>
   activeTable: ComputedRef<string | null | undefined>
   openRenameTableDialog: (table: TableType, baseId?: string | undefined, rightClick?: boolean) => void
+  addTableTab: (table: TableType) => void
 }>()
 
 const table = useVModel(props, 'modelValue') // , emits)
@@ -35,19 +36,18 @@ const { isUIAllowed } = useUIPermission()
   <div
     :key="table.id"
     v-e="['a:table:open']"
-    :class="[
-      { hidden: !filteredTables?.includes(table), active: activeTable === table.id },
-      `nc-project-tree-tbl nc-project-tree-tbl-${table.title}`,
-    ]"
-    class="nc-tree-item text-sm cursor-pointer group"
+    class="nc-tree-item text-sm group"
     :data-order="table.order"
     :data-id="table.id"
     :data-testid="`tree-view-table-${table.title}`"
-    @click="addTableTab(table)"
   >
     <GeneralTooltip class="pl-2 pr-3 py-2" modifier-key="Alt">
       <template #title>{{ table.table_name }}</template>
-      <div class="flex items-center gap-2 h-full" @contextmenu="setMenuContext('table', table)">
+      <div
+        class="flex items-center gap-2 h-full cursor-pointer"
+        @contextmenu="setMenuContext('table', table)"
+        @click="addTableTab(table)"
+      >
         <div class="flex w-auto" :data-testid="`tree-view-table-draggable-handle-${table.title}`">
           <component
             :is="isUIAllowed('tableIconCustomisation') ? Dropdown : 'div'"