diff --git a/package-lock.json b/package-lock.json
index 779d5b328..310247299 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -128,7 +128,6 @@
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -1856,7 +1855,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@bimdata/components/-/components-1.10.0.tgz",
       "integrity": "sha512-l6w2S1ZgH6KKT4osAch+lH+D+t+u+dmE1A7pC1AmPD5wC80mcs1vP/hpJrldjcrc9dVG2wnpnD7TE47GUFc0TQ==",
-      "peer": true,
       "peerDependencies": {
         "@bimdata/design-system": "*",
         "@bimdata/typescript-fetch-api-client": "*",
@@ -1867,14 +1865,12 @@
     "node_modules/@bimdata/design-system": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@bimdata/design-system/-/design-system-2.3.0.tgz",
-      "integrity": "sha512-/3vKXSptTUz2yaY4fcPCHu6fNeLYLqr03J4vQ8Tb8zKlIaUdgwcmFSTGM7bgXfyW6BlAkXPxp8wcEkcPnk2/Dw==",
-      "peer": true
+      "integrity": "sha512-/3vKXSptTUz2yaY4fcPCHu6fNeLYLqr03J4vQ8Tb8zKlIaUdgwcmFSTGM7bgXfyW6BlAkXPxp8wcEkcPnk2/Dw=="
     },
     "node_modules/@bimdata/typescript-fetch-api-client": {
       "version": "10.31.1",
       "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-10.31.1.tgz",
-      "integrity": "sha512-YmskqjInKSaZIElo/zllxbQj8/WJwOReW+9Ou3ob2NvayhulVnAu0d2B1Y6BekuWbLyjot9ftiUluxXeeij3Iw==",
-      "peer": true
+      "integrity": "sha512-YmskqjInKSaZIElo/zllxbQj8/WJwOReW+9Ou3ob2NvayhulVnAu0d2B1Y6BekuWbLyjot9ftiUluxXeeij3Iw=="
     },
     "node_modules/@bimdata/viewer": {
       "version": "2.16.0-beta.1",
@@ -3305,7 +3301,6 @@
       "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.3",
@@ -5455,7 +5450,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5986,7 +5980,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -7135,7 +7128,6 @@
       "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -7467,7 +7459,6 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7528,7 +7519,6 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -10327,7 +10317,6 @@
       "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -12715,7 +12704,6 @@
       "dev": true,
       "inBundle": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -13485,7 +13473,6 @@
       "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -14495,7 +14482,6 @@
       "integrity": "sha512-6qGjWccl5yoyugHt3jTgztJ9Y0JVzyH8/Voc/D8PlLat9pwxQYXz7W1Dpnq5h0/G5GCYGUaDSlYcyk3AMh5A6g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@semantic-release/commit-analyzer": "^13.0.1",
         "@semantic-release/error": "^4.0.0",
@@ -15840,7 +15826,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16315,7 +16300,6 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -16419,7 +16403,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16432,7 +16415,6 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.26.tgz",
       "integrity": "sha512-SJ/NTccVyAoNUJmkM9KUqPcYlY+u8OVL1X5EW9RIs3ch5H2uERxyyIUI4MRxVCSOiEcupX9xNGde1tL9ZKpimA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.26",
         "@vue/compiler-sfc": "3.5.26",
@@ -16455,6 +16437,7 @@
       "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0",
@@ -16479,6 +16462,7 @@
       "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -16491,7 +16475,6 @@
       "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.2.8.tgz",
       "integrity": "sha512-vJ123v/PXCZntd6Qj5Jumy7UBmIuE92VrtdX+AXr+1WzdBHojiBxnAxdfctUFL+/JIN+VQH4BhsfTtiGsvVObg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@intlify/core-base": "11.2.8",
         "@intlify/shared": "11.2.8",
@@ -16801,4 +16784,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/specific/files/files-manager/FilesManager.vue b/src/components/specific/files/files-manager/FilesManager.vue
index ce7c72ad5..509abb930 100644
--- a/src/components/specific/files/files-manager/FilesManager.vue
+++ b/src/components/specific/files/files-manager/FilesManager.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="files-manager">
-    <template v-if="fileStructure.children.length > 0">
+    <template v-if="hasFiles">
       <FilesManagerActions
         :currentFolder="currentFolder"
         :currentSpace="currentSpace"
@@ -12,8 +12,6 @@
         @update:searchText="searchText = $event"
         @upload-files="uploadFiles"
       />
-    </template>
-    <template v-if="fileStructure.children.length > 0">
       <div class="files-manager__content">
         <transition name="slide-fade-left">
           <FileTree
@@ -29,7 +27,7 @@
 
         <div
           class="files-manager__files"
-          :class="selectedFileTab.id !== 'folders' ? `without-tree` : ''"
+          :class="{ 'without-tree': selectedFileTab.id !== 'folders' }"
         >
           <transition name="fade">
             <FilesActionBar
@@ -185,7 +183,7 @@
 </template>
 
 <script>
-import { computed, onBeforeMount, onMounted, ref, watch } from "vue";
+import { computed, onActivated, onBeforeMount, onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
 import { useAppModal } from "../../app/app-modal/app-modal.js";
@@ -194,6 +192,7 @@ import { useAppSidePanel } from "../../app/app-side-panel/app-side-panel.js";
 import { useSession } from "../../../../composables/session.js";
 import { useListFilter } from "../../../../composables/list-filter.js";
 import { useStandardBreakpoints } from "../../../../composables/responsive.js";
+import { FILE_TYPE } from "../../../../config/files.js";
 import { MODEL_TYPE } from "../../../../config/models.js";
 import { IS_DELETION_TEMP_WORKAROUND_ENABLED } from "../../../../config/projects.js";
 import { VISA_STATUS } from "../../../../config/visa.js";
@@ -204,6 +203,7 @@ import { useModels } from "../../../../state/models.js";
 import { useProjects } from "../../../../state/projects.js";
 import { useSpaces } from "../../../../state/spaces.js";
 import { useVisa } from "../../../../state/visa.js";
+import { collectDescendants } from "../../../../utils/file-tree.js";
 import { isFolder } from "../../../../utils/file-structure.js";
 import { getFilesFromEvent } from "../../../../utils/files.js";
 import { isFullTotal } from "../../../../utils/spaces.js";
@@ -269,13 +269,9 @@ export default {
     const { openModal, closeModal } = useAppModal();
 
     const { spaceProjects } = useProjects();
-    const { gedFilesTab } = useSession();
+    const { gedFilesTab, gedTargetFolder } = useSession();
 
-    const {
-      fileStructureHandler: handler,
-      moveFiles: move,
-      downloadFiles: download,
-    } = useFiles();
+    const { fileStructureHandler: handler, moveFiles: move, downloadFiles: download } = useFiles();
     const { createModel, createPhotosphere, deleteModels } = useModels();
 
     const { fetchToValidateVisas, fetchCreatedVisas } = useVisa();
@@ -285,52 +281,9 @@ export default {
     const toValidateVisas = ref([]);
     const createdVisas = ref([]);
     const allTags = ref([]);
+    const hasFiles = computed(() => props.fileStructure.children.length > 0);
 
-    const getFilesInFolder = (folder) => {
-      const files = [];
-      folder.children.forEach((child) => {
-        if (isFolder(child)) {
-          files.push(...getFilesInFolder(child));
-        } else {
-          files.push(child);
-        }
-      });
-      return files;
-    };
-    const allFiles = computed(() =>
-      props.fileStructure.children.flatMap((file) => {
-        if (isFolder(file)) {
-          return getFilesInFolder(file);
-        } else {
-          return file;
-        }
-      })
-    );
-
-    watch(
-      () => props.fileStructure,
-      (struct) => {
-        if (!currentFolder.value || !handler.exists(currentFolder.value)) {
-          currentFolder.value = struct;
-        } else {
-          currentFolder.value = handler.deserialize(currentFolder.value);
-        }
-      },
-      { immediate: true }
-    );
-    watch(
-      () => currentFolder.value,
-      (folder) => {
-        const childrenFolders = folder.children
-          .filter((child) => isFolder(child))
-          .sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1));
-        const childrenFiles = folder.children
-          .filter((child) => !isFolder(child))
-          .sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1));
-        currentFiles.value = childrenFolders.concat(childrenFiles);
-      },
-      { immediate: true }
-    );
+    const sortByName = (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase());
 
     const filesTable = ref(null);
     const documentViewerFilesList = computed(() => {
@@ -428,7 +381,7 @@ export default {
 
     const filesToDelete = ref([]);
     const showDeleteModal = ref(false);
-    const openFileDeleteModal = files => {
+    const openFileDeleteModal = (files) => {
       filesToDelete.value = files;
       openModal({
         component: FilesDeleteModal,
@@ -465,7 +418,7 @@ export default {
       closeModal();
     };
 
-    const openFileDeleteModalOrWarningModal = files => {
+    const openFileDeleteModalOrWarningModal = (files) => {
       if (IS_DELETION_TEMP_WORKAROUND_ENABLED) {
         openModal({ component: WarningModal });
       } else {
@@ -487,27 +440,16 @@ export default {
     const showVersioningManager = ref(false);
     const showVisaManager = ref(false);
     const showTagManager = ref(false);
-    const setManagerVisibility = (manager, visibility) => {
-      showVisaManager.value = false;
-      showVersioningManager.value = false;
-      showAccessManager.value = false;
-      showTagManager.value = false;
-
-      switch (manager) {
-        case "visa":
-          showVisaManager.value = visibility;
-          break;
-        case "versioning":
-          showVersioningManager.value = visibility;
-          break;
-        case "access":
-          showAccessManager.value = visibility;
-          break;
-        case "tag":
-          showTagManager.value = visibility;
-          break;
-        default:
-          break;
+    const managers = {
+      visa: showVisaManager,
+      versioning: showVersioningManager,
+      access: showAccessManager,
+      tag: showTagManager,
+    };
+    const setManagerVisibility = (manager, value) => {
+      Object.values(managers).forEach((ref) => (ref.value = false));
+      if (managers[manager]) {
+        managers[manager].value = value;
       }
     };
 
@@ -545,13 +487,13 @@ export default {
     };
 
     const visasLoading = ref(false);
-    const openVisaManager = file => {
+    const openVisaManager = (file) => {
       onTabChange(filesTabs[2]);
       openSidePanel();
       try {
         visasLoading.value = true;
         fileToManage.value = file;
-        currentVisa.value = file
+        currentVisa.value = file;
         setManagerVisibility("visa", true);
       } finally {
         visasLoading.value = false;
@@ -656,34 +598,30 @@ export default {
       });
     });
 
-    onMounted(async () => {
+    onMounted(() => {
       fetchVisas();
       fetchTags();
     });
 
+    onActivated(() => {
+      const folderId = gedTargetFolder.get();
+      if (folderId) {
+        jumpToTargetFolder(folderId);
+      } else {
+        jumpToTargetFolder(props.fileStructure.id);
+      }
+      gedTargetFolder.clear();
+    });
+
     const openSubscriptionModal = () => {
       openModal({ component: SubscriptionModal });
     };
 
-    const getFoldersInFolder = (folder) => {
-      const folders = [];
-      folder.children.forEach((child) => {
-        if (isFolder(child)) {
-          folders.push(child);
-          folders.push(...getFoldersInFolder(child));
-        }
-      });
-      return folders;
-    };
-    const allFolders = computed(() =>
-      props.fileStructure.children.flatMap((file) => {
-        if (isFolder(file)) {
-          return [file, ...getFoldersInFolder(file)];
-        } else {
-          return [];
-        }
-      })
-    );
+    const getFoldersInFolder = (folder) => collectDescendants(folder, isFolder);
+    const getFilesInFolder = (folder) => collectDescendants(folder, (child) => !isFolder(child));
+
+    const allFiles = computed(() => getFilesInFolder(props.fileStructure));
+    const allFolders = computed(() => getFoldersInFolder(props.fileStructure));
 
     const filesTabs = [
       {
@@ -742,12 +680,44 @@ export default {
       (visa) => visa.document.name
     );
 
+    const jumpToTargetFolder = (folderId) => {
+      selectedFileTab.value = filesTabs[0];
+      const folder = handler.get({ nature: FILE_TYPE.FOLDER, id: folderId });
+      currentFolder.value = handler.deserialize(folder);
+    };
+
     watch(searchText, (newValue) => {
       filterFilesSearchText.value = newValue;
       filterAllFilesSearchText.value = newValue;
       filterVisasSearchText.value = newValue;
     });
 
+    watch(
+      () => props.fileStructure,
+      (struct) => {
+        const folderId = gedTargetFolder.get();
+
+        if (folderId) {
+          jumpToTargetFolder(folderId);
+          gedTargetFolder.clear();
+        } else {
+          currentFolder.value = struct;
+        }
+      },
+      { immediate: true }
+    );
+
+    watch(
+      () => currentFolder.value,
+      (folder) => {
+        const childrenFolders = folder.children.filter(isFolder).sort(sortByName);
+        const childrenFiles = folder.children.filter((c) => !isFolder(c)).sort(sortByName);
+        currentFiles.value = childrenFolders.concat(childrenFiles);
+        gedTargetFolder.set(folder.id);
+      },
+      { immediate: true }
+    );
+
     return {
       // References
       allFiles,
@@ -767,6 +737,7 @@ export default {
       filesToUpload,
       foldersToUpload,
       folderToManage,
+      hasFiles,
       importFromOtherProjectsActions,
       loadingFileIds,
       MODEL_TYPE,
diff --git a/src/components/specific/models/models-manager/ModelsManager.vue b/src/components/specific/models/models-manager/ModelsManager.vue
index 80f6b5da6..765bda300 100644
--- a/src/components/specific/models/models-manager/ModelsManager.vue
+++ b/src/components/specific/models/models-manager/ModelsManager.vue
@@ -66,6 +66,7 @@
             :types="currentTab.modelTypes"
             :models="currentTab.models"
             @file-uploaded="$emit('file-uploaded')"
+            @go-folders-view="$emit('go-folders-view', $event)"
           />
         </keep-alive>
       </transition>
@@ -163,7 +164,7 @@ export default {
       required: true
     }
   },
-  emits: ["file-uploaded"],
+  emits: ["file-uploaded", "go-folders-view"],
   setup(props) {
     const { projectModelTab } = useSession();
     const {
diff --git a/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue b/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
index 383ddce91..ee10ec9b3 100644
--- a/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
+++ b/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
@@ -59,6 +59,7 @@
       @file-uploaded="onFileUploaded"
       @upload-canceled="onUploadCanceled"
       @upload-failed="onUploadCanceled"
+      @go-folders-view="$emit('go-folders-view', $event)"
       @selection-changed="selection = $event"
       @archive="archiveModels([$event])"
       @unarchive="unarchiveModels([$event])"
@@ -133,6 +134,7 @@ export default {
     "edit-metaBuilding",
     "edit-photosphereBuilding",
     "file-uploaded",
+    "go-folders-view",
     "tab-changed",
     "view-metaBuilding",
     "view-photosphereBuilding",
diff --git a/src/components/specific/models/models-table/ModelsTable.vue b/src/components/specific/models/models-table/ModelsTable.vue
index 8e5dcd670..c9cc5dec8 100644
--- a/src/components/specific/models/models-table/ModelsTable.vue
+++ b/src/components/specific/models/models-table/ModelsTable.vue
@@ -1,13 +1,12 @@
 <template>
   <BIMDataTable
+    ref="modelsTable"
     class="models-table"
     data-test-id="models-table"
     tableLayout="fixed"
     :columns="columns"
-    :rows="models"
+    :rows="modelsWithTags"
     rowKey="id"
-    :paginated="true"
-    :perPage="7"
     :selectable="true"
     @selection-changed="$emit('selection-changed', $event)"
   >
@@ -36,6 +35,21 @@
         @close="nameEditMode[model.id] = false"
       />
     </template>
+    <template #column-filter-empty>
+      <span class="color-granite" style="font-weight: 400">{{ $t("Tag.emptyTag") }}</span>
+    </template>
+    <template #cell-tags="{ row: model }">
+      <ModelTagsCell :model="model" :parent="modelsTable" />
+    </template>
+    <template #cell-location="{ row: model }">
+      <div class="visas-table__location">
+        <ModelPathCell
+          :model="model"
+          :allFolders="allFolders"
+          @go-folders-view="$emit('go-folders-view', $event)"
+        />
+      </div>
+    </template>
     <template #cell-version="{ row: { version } }">
       {{ version ?? "-" }}
     </template>
@@ -73,36 +87,43 @@
 </template>
 
 <script>
-import { computed, reactive, watch } from "vue";
+import { ref, computed, reactive, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import columnsDef from "./columns.js";
 import { useStandardBreakpoints } from "../../../../composables/responsive.js";
+import { useFiles } from "../../../../state/files.js";
+import { collectDescendants } from "../../../../utils/file-tree.js";
+import { isFolder } from "../../../../utils/file-structure.js";
 // Components
 import FileUploadCard from "../../files/file-upload-card/FileUploadCard.js";
 import ModelActionsCell from "./model-actions-cell/ModelActionsCell.vue";
 import ModelNameCell from "./model-name-cell/ModelNameCell.vue";
 import ModelStatusCell from "./model-status-cell/ModelStatusCell.vue";
+import ModelTagsCell from "./model-tags-cell/ModelTagsCell.vue";
+import ModelPathCell from "./model-path-cell/ModelPathCell.vue";
 
 export default {
   components: {
     ModelActionsCell,
     ModelNameCell,
     ModelStatusCell,
-    FileUploadCard
+    FileUploadCard,
+    ModelTagsCell,
+    ModelPathCell,
   },
   props: {
     project: {
       type: Object,
-      required: true
+      required: true,
     },
     models: {
       type: Array,
-      required: true
+      required: true,
     },
     fileUploads: {
       type: Array,
       default: () => [],
-    }
+    },
   },
   emits: [
     "archive",
@@ -111,6 +132,7 @@ export default {
     "edit-metaBuilding",
     "edit-photosphereBuilding",
     "file-uploaded",
+    "go-folders-view",
     "selection-changed",
     "unarchive",
     "upload-canceled",
@@ -121,23 +143,23 @@ export default {
   setup(props) {
     const { t } = useI18n();
     const { isLG, isXL } = useStandardBreakpoints();
+    const { projectFileStructure } = useFiles();
 
+    const modelsTable = ref(null);
     const columns = computed(() => {
       let filteredColumns = columnsDef;
       if (isLG.value) {
-        filteredColumns = filteredColumns.filter(col =>
+        filteredColumns = filteredColumns.filter((col) =>
           ["name", "status", "actions"].includes(col.id)
         );
       } else if (isXL.value) {
-        filteredColumns = filteredColumns.filter(col =>
-          ["name", "creator", "lastupdate", "status", "actions"].includes(
-            col.id
-          )
+        filteredColumns = filteredColumns.filter((col) =>
+          ["name", "creator", "lastupdate", "status", "actions"].includes(col.id)
         );
       }
-      return filteredColumns.map(col => ({
+      return filteredColumns.map((col) => ({
         ...col,
-        label: col.label ?? t(col.text)
+        label: col.label ?? t(col.text),
       }));
     });
 
@@ -146,22 +168,75 @@ export default {
       () => props.models,
       () => {
         nameEditMode = reactive({});
-        props.models.forEach(model => (nameEditMode[model.id] = false));
+        props.models.forEach((model) => (nameEditMode[model.id] = false));
       },
       { immediate: true }
     );
 
+    const getFoldersInFolder = (folder) => collectDescendants(folder, isFolder);
+    const getFilesInFolder = (folder) => collectDescendants(folder, (child) => !isFolder(child));
+
+    const allFolders = computed(() =>
+      projectFileStructure.value.children.flatMap((file) => {
+        if (isFolder(file)) {
+          return [file, ...getFoldersInFolder(file)];
+        } else {
+          return [];
+        }
+      })
+    );
+    const allFiles = computed(() =>
+      projectFileStructure.value.children.flatMap((file) => {
+        if (isFolder(file)) {
+          return getFilesInFolder(file);
+        } else {
+          return file;
+        }
+      })
+    );
+
+    const tagsByModelId = computed(() => {
+      const map = {};
+
+      allFiles.value.forEach((file) => {
+        const modelId = file.model_id;
+        if (!modelId || !file.tags) return;
+
+        if (!map[modelId]) {
+          map[modelId] = [];
+        }
+
+        map[modelId].push(...file.tags);
+      });
+
+      return map;
+    });
+
+    const modelsWithTags = computed(() =>
+      props.models.map((model) => ({
+        ...model,
+        tags: tagsByModelId.value[model.id] ?? [],
+      }))
+    );
+
     return {
       // References
+      allFolders,
       columns,
+      modelsTable,
+      modelsWithTags,
       nameEditMode,
+      fileStructure: projectFileStructure,
     };
-  }
+  },
 };
 </script>
 
 <style scoped>
 .models-table {
+  height: 100%;
+  max-height: 460px;
+  overflow: auto;
   .file-uploads {
     position: absolute;
     z-index: 1;
diff --git a/src/components/specific/models/models-table/columns.js b/src/components/specific/models/models-table/columns.js
index e94706bd5..400c98d5f 100644
--- a/src/components/specific/models/models-table/columns.js
+++ b/src/components/specific/models/models-table/columns.js
@@ -9,6 +9,20 @@ export default [
     id: "name",
     text: "t.name"
   },
+  {
+    id: "tags",
+    text: "ModelsTable.headers.tags",
+    filter: true,
+    filterKey: "name",
+    width: "100px",
+    align: "center"
+  },
+  {
+    id: "location",
+    text: "ModelsTable.headers.location",
+    width: "200px",
+    align: "left"
+  },
   {
     id: "version",
     text: "ModelsTable.headers.version",
@@ -30,7 +44,7 @@ export default [
   {
     id: "status",
     text: "t.status",
-    width: "80px",
+    width: "120px",
     align: "center"
   },
   {
diff --git a/src/components/specific/models/models-table/model-path-cell/ModelPathCell.scss b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.scss
new file mode 100644
index 000000000..a28047c53
--- /dev/null
+++ b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.scss
@@ -0,0 +1,46 @@
+.model-path-cell {
+  position: relative;
+  height: 100%;
+  width: max-content;
+  display: flex;
+  align-items: center;
+  &__last-folder {
+    height: 34px;
+    max-width: 100%;
+    padding: 0 var(--spacing-unit);
+    border-radius: 50px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    transition: all ease 0.25s;
+    &:hover {
+      background-color: rgba(47, 55, 74, 0.03);
+      transition: all ease 0.25s;
+    }
+  }
+  &__location {
+    padding: 0 8px;
+    width: max-content;
+    min-width: 100%;
+    position: absolute;
+    top: -8px;
+    right: 0%;
+    background-color: white;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    border-radius: 50px;
+    box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.1);
+    z-index: 1;
+    .folder-name {
+      padding: 0 var(--spacing-unit);
+      height: 40px;
+      border-radius: 50px;
+      cursor: pointer;
+      &:hover {
+        background-color: #e0eef9;
+      }
+    }
+  }
+}
diff --git a/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue
new file mode 100644
index 000000000..4e26ac619
--- /dev/null
+++ b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue
@@ -0,0 +1,161 @@
+<template>
+  <div class="model-path-cell" @mouseenter="hovering = true" @mouseleave="hovering = false">
+    <div class="model-path-cell__last-folder" v-click-away="() => (showFullPath = false)">
+      <BIMDataIconFolderLocation fill color="primary" margin="0 12px 0 0" />
+      <BIMDataTextbox
+        :text="lastFolderLocation(model.document)"
+        cutPosition="middle"
+        :tooltip="false"
+        width="auto"
+        maxWidth="200px"
+      />
+    </div>
+    <transition name="fade">
+      <div v-if="hovering || showFullPath" class="model-path-cell__location">
+        <div
+          v-if="truncatedFolderLocation(model.document).length > 0"
+          class="flex items-center"
+          v-for="(folder, index) in truncatedFolderLocation(model.document)"
+          :key="folder.id"
+        >
+          <div
+            class="folder-name flex items-center"
+            @click.stop="selectFile(folder)"
+            v-if="folder.id !== 'ellipsis'"
+          >
+            <BIMDataIconFolderLocation
+              v-if="index === truncatedFolderLocation(model.document).length - 1"
+              fill
+              color="primary"
+              margin="0 6px 0 0"
+            />
+            <BIMDataIconFolder v-else fill color="primary" margin="0 6px 0 0" />
+            <BIMDataTextbox
+              :text="folder.name"
+              cutPosition="middle"
+              tooltipPosition="bottom"
+              tooltipColor="primary"
+              width="auto"
+              maxWidth="200px"
+            >
+            </BIMDataTextbox>
+          </div>
+          <div v-if="folder.id === 'ellipsis'" class="folder-ellipsis flex items-center m-x-12">
+            <BIMDataTextbox
+              :text="folder.name"
+              cutPosition="middle"
+              tooltipPosition="bottom"
+              tooltipColor="primary"
+              width="auto"
+              maxWidth="200px"
+            >
+            </BIMDataTextbox>
+          </div>
+          <div v-if="showChevron(folder, index, model.document)" class="m-x-6">
+            <BIMDataIconChevron size="xxxs" fill color="default" />
+          </div>
+        </div>
+
+        <span
+          v-else
+          class="folder-name flex items-center"
+          @click.stop="goToGedRoot"
+        >
+          <BIMDataIconFolderLocation fill color="primary" margin="0 6px 0 0" />
+          {{ $t("t.rootFolder") }}
+        </span>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+import { ref, onDeactivated, onActivated } from "vue";
+import { useI18n } from "vue-i18n";
+import { getAscendants } from "../../../../../utils/file-structure.js";
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+    allFolders: {
+      type: Array,
+      required: true,
+    },
+  },
+  emits: ["go-folders-view"],
+  setup(props, { emit }) {
+    const { t } = useI18n();
+
+    const folderLocation = (model) => {
+      const parentFolders = getAscendants(model, props.allFolders)
+        .map((f) => ({
+          id: f.id,
+          name: f.name,
+        }))
+        .reverse();
+      return parentFolders;
+    };
+
+    const truncatedFolderLocation = (model) => {
+      const parentFolders = folderLocation(model);
+      const maxFoldersToShow = 4;
+
+      if (parentFolders.length > maxFoldersToShow) {
+        return [
+          ...parentFolders.slice(0, 2), // Les 2 premiers dossiers
+          { id: "ellipsis", name: "..." }, // L'élément '...'
+          ...parentFolders.slice(-2), // Les 2 derniers dossiers
+        ];
+      }
+      return parentFolders;
+    };
+
+    const lastFolderLocation = (model) => {
+      const parentFolders = getAscendants(model, props.allFolders);
+      return parentFolders[0]?.name ?? t("t.rootFolder");
+    };
+
+    const hovering = ref(false);
+    const showFullPath = ref(false);
+
+    const selectFile = (folder) => {
+      const selectedFolder = props.allFolders.find((f) => f.id === folder.id);
+      emit("go-folders-view", selectedFolder);
+    };
+
+    const showChevron = (folder, index, model) => {
+      return (
+        index < truncatedFolderLocation(model).length - 1 &&
+        folder.id !== "ellipsis" &&
+        truncatedFolderLocation(model)[index + 1].id !== "ellipsis"
+      );
+    };
+
+    const resetHover = () => {
+      hovering.value = false;
+      showFullPath.value = false;
+    };
+
+    onActivated(resetHover);
+    onDeactivated(resetHover);
+
+    const goToGedRoot = () => {
+      emit("go-folders-view", null);
+    };
+
+    return {
+      hovering,
+      showFullPath,
+      goToGedRoot,
+      lastFolderLocation,
+      selectFile,
+      showChevron,
+      truncatedFolderLocation,
+    };
+  },
+};
+</script>
+
+<style scoped lang="scss" src="./ModelPathCell.scss"></style>
diff --git a/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.scss b/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.scss
index 86d3f6d5b..694f08cfd 100644
--- a/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.scss
+++ b/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.scss
@@ -1,25 +1,39 @@
 .model-status-cell {
-  display: inline-flex;
+  margin: auto;
+  padding: 0 var(--spacing-unit);
+  height: 26px;
+  width: max-content;
+  display: flex;
   justify-content: center;
   align-items: center;
-  width: 18px;
-  height: 18px;
-  margin: calc(var(--spacing-unit) / 2);
+  border-radius: 50px;
+
+  .status-icon {
+    margin-right: 3px;
+    border-radius: 50px;
+    width: 8px;
+    height: 8px;
+    background-color: currentColor;
+  }
 
   &--pending,
   &--in-progress {
+    background-color: #e2e3e6;
     color: var(--color-primary);
   }
 
   &--completed {
+    background-color: #dbf4e6;
     color: var(--color-success);
   }
 
   &--warning {
+    background-color: #fff0db;
     color: var(--color-warning);
   }
 
   &--error {
+    background-color: #ffe4df;
     color: var(--color-high);
   }
 }
diff --git a/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.vue b/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.vue
index 43aeac710..9335d1c10 100644
--- a/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.vue
+++ b/src/components/specific/models/models-table/model-status-cell/ModelStatusCell.vue
@@ -1,7 +1,9 @@
 <template>
   <span class="model-status-cell" :class="`model-status-cell--${statusName}`">
-    <BIMDataSpinner v-if="['pending', 'in-progress'].includes(statusName)" />
-    <BIMDataIcon v-else :name="statusIcon" size="s" />
+    <div class="status-icon"></div>
+    <span>
+      {{ statusName === "completed" ? "ok" : statusName }}
+    </span>
   </span>
 </template>
 
@@ -14,12 +16,12 @@ export default {
   props: {
     project: {
       type: Object,
-      required: true
+      required: true,
     },
     model: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
   },
   setup(props) {
     const { fetchModelByID, loadProjectModels } = useModels();
@@ -27,7 +29,7 @@ export default {
     const statusName = ref("");
     const statusIcon = ref("");
 
-    const setStatus = status => {
+    const setStatus = (status) => {
       switch (status) {
         case MODEL_STATUS.PENDING:
           statusName.value = "pending";
@@ -80,9 +82,9 @@ export default {
 
     return {
       statusIcon,
-      statusName
+      statusName,
     };
-  }
+  },
 };
 </script>
 
diff --git a/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.scss b/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.scss
new file mode 100644
index 000000000..0310d4298
--- /dev/null
+++ b/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.scss
@@ -0,0 +1,78 @@
+.model-tags-cell-pills {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  flex-wrap: wrap;
+  height: 36px;
+  width: 100%;
+  gap: 3px;
+
+  &__pill {
+    border-radius: 4px;
+    height: 10px;
+    width: 25px;
+  }
+
+  &__ellipsis-box {
+    position: relative;
+    height: 10px;
+    width: 25px;
+
+    &__icon {
+      position: absolute;
+      right: -6px;
+      top: -13px;
+    }
+  }
+
+  &__over {
+    position: absolute;
+    pointer-events: none;
+    z-index: 1;
+    top: -9px;
+
+    &__list {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-wrap: wrap;
+      padding: auto 12px;
+      width: 150px;
+      gap: 3px;
+
+      &__tag {
+        box-sizing: border-box;
+        border-radius: 4px;
+        height: 20px;
+
+        &__text {
+          padding: 2px 5px;
+          font-size: 10px;
+        }
+      }
+    }
+  }
+}
+
+.model-tags-cell {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  height: 100%;
+  width: 100%;
+  gap: 3px;
+
+  &__tag {
+    box-sizing: border-box;
+    border-radius: 4px;
+    display: flex;
+    height: 20px;
+
+    &__text {
+      padding: 2px 5px;
+      font-size: 10px;
+    }
+  }
+}
diff --git a/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.vue b/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.vue
new file mode 100644
index 000000000..a84056ac2
--- /dev/null
+++ b/src/components/specific/models/models-table/model-tags-cell/ModelTagsCell.vue
@@ -0,0 +1,163 @@
+<template>
+  <template v-if="isPillsMod">
+    <div
+      ref="cellPills"
+      class="model-tags-cell-pills"
+      @mouseenter="hasTags && onHover"
+      @mouseleave="isOver = false"
+    >
+      <template v-for="(tag, index) in model.tags.slice(0, 9)" :key="tag.id">
+        <template v-if="model.tags.length > 9 && index === 8">
+          <div class="model-tags-cell-pills__ellipsis-box">
+            <BIMDataIconEllipsis
+              class="model-tags-cell-pills__ellipsis-box__icon"
+              size="xl"
+              :rotate="90"
+              style
+            />
+          </div>
+        </template>
+        <template v-else>
+          <div
+            class="model-tags-cell-pills__pill"
+            :style="{
+              backgroundColor: `#${tag.color}40`,
+              border: `1px solid #${tag.color}`
+            }"
+          ></div>
+        </template>
+      </template>
+      <BIMDataCard
+        v-show="isOver"
+        ref="tagList"
+        class="model-tags-cell-pills__over"
+        width="150px"
+      >
+        <template #content>
+          <div class="model-tags-cell-pills__over__list">
+            <template v-for="tag in model.tags" :key="tag.id">
+              <div
+                class="model-tags-cell-pills__over__list__tag"
+                :style="{
+                  color: `#${tag.color}`,
+                  border: `1px solid #${tag.color}`
+                }"
+              >
+                <BIMDataTextbox
+                  class="model-tags-cell-pills__over__list__tag__text"
+                  :text="tag.name"
+                  maxWidth="150px"
+                />
+              </div>
+            </template>
+          </div>
+        </template>
+      </BIMDataCard>
+    </div>
+  </template>
+  <template v-else>
+    <div ref="cell" class="model-tags-cell">
+      <template v-for="tag in model.tags" :key="tag.id">
+        <div
+          class="model-tags-cell__tag"
+          :style="{
+            color: `#${tag.color}`,
+            border: `1px solid #${tag.color}`
+          }"
+        >
+          <BIMDataTextbox
+            class="model-tags-cell__tag__text"
+            :text="tag.name"
+            :maxWidth="`${cellWidth}px`"
+          />
+        </div>
+      </template>
+    </div>
+  </template>
+</template>
+
+<script>
+import { nextTick, onMounted, onUnmounted, ref, watch, computed } from "vue";
+import { dropdownPositioner } from "../../../../../utils/positioner.js";
+
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true
+    },
+    parent: {
+      type: Object
+    }
+  },
+  setup(props) {
+    const cellWidth = ref(0);
+    const maxCellHeight = 43; // stand for two lines of tags
+    const isPillsMod = ref(false);
+    const hasTags = computed(() => props.model.tags?.length > 0);
+
+    const onResize = entries => {
+      entries.forEach(entry => {
+        cellWidth.value = entry.contentRect.width;
+        const height = entry.target.scrollHeight;
+        isPillsMod.value = height > maxCellHeight;
+      });
+    };
+
+    watch(isPillsMod, () => {
+      if (isPillsMod.value) {
+        cellObserver.disconnect();
+      }
+    });
+
+    watch(
+      () => props.model.tags,
+      () => {
+        if (isPillsMod.value) {
+          isPillsMod.value = false;
+          nextTick(() => cellObserver.observe(cell.value));
+        }
+      }
+    );
+
+    const cell = ref(null);
+    const cellObserver = new ResizeObserver(onResize);
+
+    onMounted(() => cellObserver.observe(cell.value));
+    onUnmounted(() => cellObserver.disconnect());
+
+    const tagList = ref(null);
+    const cellPills = ref(null);
+
+    const isOver = ref(false);
+
+    const onHover = () => {
+      if (!hasTags.value) return;
+      isOver.value = true;
+      nextTick(() => {
+        tagList.value.$el.style.top = dropdownPositioner(
+          props.parent.$el,
+          tagList.value.$el,
+          9
+        );
+      });
+    };
+
+    return {
+      // references
+      cell,
+      isOver,
+      hasTags,
+      tagList,
+      cellPills,
+      cellWidth,
+      maxCellHeight,
+      isPillsMod,
+      // methods
+      onHover
+    };
+  }
+};
+</script>
+
+<style scoped lang="scss" src="./ModelTagsCell.scss"></style>
diff --git a/src/composables/session.js b/src/composables/session.js
index 83e241502..38b094876 100644
--- a/src/composables/session.js
+++ b/src/composables/session.js
@@ -5,30 +5,30 @@ const STORAGE_KEYS = Object.freeze({
   PREVIOUS_VIEW: `${KEY_PREFIX}:previous-view`,
   PROJECT_VIEW: `${KEY_PREFIX}:project-view`,
   PROJECT_MODEL_TAB: `${KEY_PREFIX}:project-model-tab`,
-  GED_FILES_TAB: `${KEY_PREFIX}:ged-files-tab`
+  GED_FILES_TAB: `${KEY_PREFIX}:ged-files-tab`,
+  GED_TARGET_FOLDER: `${KEY_PREFIX}:ged-target-folder`,
 });
 
-const getEntry = key => JSON.parse(sessionStorage.getItem(key));
+const getEntry = (key) => JSON.parse(sessionStorage.getItem(key));
 
-const setEntry = (key, value) =>
-  sessionStorage.setItem(key, JSON.stringify(value));
+const setEntry = (key, value) => sessionStorage.setItem(key, JSON.stringify(value));
 
 const currentView = {
   get() {
-    return getEntry(`${STORAGE_KEYS.CURRENT_VIEW}`);
+    return getEntry(STORAGE_KEYS.CURRENT_VIEW);
   },
   set(value) {
-    setEntry(`${STORAGE_KEYS.CURRENT_VIEW}`, value);
-  }
+    setEntry(STORAGE_KEYS.CURRENT_VIEW, value);
+  },
 };
 
 const previousView = {
   get() {
-    return getEntry(`${STORAGE_KEYS.PREVIOUS_VIEW}`);
+    return getEntry(STORAGE_KEYS.PREVIOUS_VIEW);
   },
   set(value) {
-    setEntry(`${STORAGE_KEYS.PREVIOUS_VIEW}`, value);
-  }
+    setEntry(STORAGE_KEYS.PREVIOUS_VIEW, value);
+  },
 };
 
 const projectView = {
@@ -37,7 +37,7 @@ const projectView = {
   },
   set(projectID, viewKey) {
     setEntry(`${STORAGE_KEYS.PROJECT_VIEW}:${projectID}`, viewKey);
-  }
+  },
 };
 
 const gedFilesTab = {
@@ -46,8 +46,8 @@ const gedFilesTab = {
   },
   set(projectID, tabKey) {
     setEntry(`${STORAGE_KEYS.GED_FILES_TAB}:${projectID}`, tabKey);
-  }
-}
+  },
+};
 
 const projectModelTab = {
   get(projectID) {
@@ -55,7 +55,19 @@ const projectModelTab = {
   },
   set(projectID, tabKey) {
     setEntry(`${STORAGE_KEYS.PROJECT_MODEL_TAB}:${projectID}`, tabKey);
-  }
+  },
+};
+
+const gedTargetFolder = {
+  get() {
+    return getEntry(STORAGE_KEYS.GED_TARGET_FOLDER);
+  },
+  set(folderId) {
+    setEntry(STORAGE_KEYS.GED_TARGET_FOLDER, folderId);
+  },
+  clear() {
+    sessionStorage.removeItem(STORAGE_KEYS.GED_TARGET_FOLDER);
+  },
 };
 
 export function useSession() {
@@ -64,6 +76,7 @@ export function useSession() {
     previousView,
     projectView,
     gedFilesTab,
-    projectModelTab
+    gedTargetFolder,
+    projectModelTab,
   };
 }
diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
index dcdda9c3f..716f09af2 100644
--- a/src/i18n/lang/fr.json
+++ b/src/i18n/lang/fr.json
@@ -359,6 +359,8 @@
   },
   "ModelsTable": {
     "headers": {
+      "tags": "Tags",
+      "location": "Emplacement",
       "version": "Version"
     },
     "emptyTablePlaceholder": {
diff --git a/src/utils/file-structure.js b/src/utils/file-structure.js
index 1b72c8ea9..23119fc48 100644
--- a/src/utils/file-structure.js
+++ b/src/utils/file-structure.js
@@ -10,7 +10,7 @@ import { FILE_TYPE } from "../config/files.js";
  */
 function uuid(file) {
   let nature = file.nature;
-  if(file.nature !== FILE_TYPE.FOLDER) {
+  if (file.nature !== FILE_TYPE.FOLDER) {
     nature = FILE_TYPE.DOCUMENT;
   }
   return `${nature}-${file.id}`;
diff --git a/src/utils/file-tree.js b/src/utils/file-tree.js
new file mode 100644
index 000000000..a541d97c6
--- /dev/null
+++ b/src/utils/file-tree.js
@@ -0,0 +1,17 @@
+import { isFolder } from "./file-structure.js";
+
+export const collectDescendants = (folder, predicate) => {
+  const result = [];
+
+  folder.children.forEach((child) => {
+    if (predicate(child)) {
+      result.push(child);
+    }
+
+    if (isFolder(child)) {
+      result.push(...collectDescendants(child, predicate));
+    }
+  });
+
+  return result;
+};
diff --git a/src/views/project-board/ProjectBoard.vue b/src/views/project-board/ProjectBoard.vue
index 2aa82d281..c78009478 100644
--- a/src/views/project-board/ProjectBoard.vue
+++ b/src/views/project-board/ProjectBoard.vue
@@ -47,7 +47,7 @@
     <div class="project-board__body">
       <Transition name="fade" mode="out-in">
         <KeepAlive>
-          <component :is="currentView" />
+          <component :is="currentView" @go-folders-view="changeView('files')"  />
         </KeepAlive>
       </Transition>
     </div>
diff --git a/src/views/project-board/project-overview/ProjectOverview.vue b/src/views/project-board/project-overview/ProjectOverview.vue
index 4b0df7276..c3f541c56 100644
--- a/src/views/project-board/project-overview/ProjectOverview.vue
+++ b/src/views/project-board/project-overview/ProjectOverview.vue
@@ -120,6 +120,7 @@
           :project="project"
           :models="models"
           @file-uploaded="reloadData"
+          @go-folders-view="goToGEDView($event)"
         />
       </AppLoading>
     </div>
@@ -135,6 +136,7 @@ import { useAppNotification } from "../../../components/specific/app/app-notific
 import { useAppSidePanel } from "../../../components/specific/app/app-side-panel/app-side-panel.js";
 import { useStandardBreakpoints } from "../../../composables/responsive.js";
 import { useToggle } from "../../../composables/toggle.js";
+import { useSession } from "../../../composables/session.js";
 
 import { useFiles } from "../../../state/files.js";
 import { useGroups } from "../../../state/groups.js";
@@ -175,13 +177,15 @@ export default {
     ProjectNotificationsRecipients,
     ProjectNotificationTimezoneChoice,
   },
-  setup() {
+  emits: ["go-folders-view"],
+  setup(props, { emit }) {
     const { t } = useI18n();
     const { openModal } = useAppModal();
     const { pushNotification } = useAppNotification();
     const { openSidePanel, closeSidePanel } = useAppSidePanel();
     const { isUserOrga, isProjectGuest } = useUser();
     const { projectGroups } = useGroups();
+    const { gedTargetFolder } = useSession();
 
     const { currentSpace, spaceSubInfo, loadSpaceSubInfo } = useSpaces();
     const { currentProject, projectUsers, projectInvitations, fetchProjectNotification } =
@@ -203,6 +207,16 @@ export default {
       toggle: toggleFileUploader,
     } = useToggle();
 
+    const goToGEDView = (folder) => {
+      if (folder?.id) {
+        gedTargetFolder.set(folder.id);
+      } else {
+        gedTargetFolder.clear();
+      }
+
+      emit("go-folders-view");
+    };
+
     const modelsPreview = computed(() =>
       projectModels.value.filter(
         (model) =>
@@ -288,6 +302,7 @@ export default {
       closeFileUploader,
       closeSidePanel,
       closeNotificationPanel,
+      goToGEDView,
       isFullTotal,
       isProjectGuest,
       isUserOrga,