diff --git a/client/src/common/queue.ts b/client/src/common/queue.ts
index f0a36b3a45f..9ee59ab7a60 100644
--- a/client/src/common/queue.ts
+++ b/client/src/common/queue.ts
@@ -26,6 +26,10 @@ class FIFO<T> {
   length(): number {
     return this.entries.length;
   }
+
+  has(findFunction: (val: T) => boolean): boolean {
+    return this.entries.find(findFunction) !== undefined;
+  }
 }
 
 export { FIFO };
diff --git a/client/src/components/sidebar/SidebarRecentFileItem.vue b/client/src/components/sidebar/SidebarRecentFileItem.vue
new file mode 100644
index 00000000000..f1d562e662e
--- /dev/null
+++ b/client/src/components/sidebar/SidebarRecentFileItem.vue
@@ -0,0 +1,81 @@
+<!-- Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS -->
+
+<template>
+  <ion-item
+    lines="none"
+    button
+    @click="$emit('fileClicked', file)"
+    class="sidebar-item menu-default"
+    ref="itemRef"
+  >
+    <ion-text class="sidebar-item-file-label">{{ file.name }}</ion-text>
+    <div
+      class="file-option"
+      @click.stop="$emit('removeClicked', file)"
+    >
+      <ion-icon :icon="close" />
+    </div>
+  </ion-item>
+</template>
+
+<script setup lang="ts">
+import { IonItem, IonText, IonIcon } from '@ionic/vue';
+import { close } from 'ionicons/icons';
+import { RecentFile } from '@/services/recentFiles';
+
+defineProps<{
+  file: RecentFile;
+}>();
+
+defineEmits<{
+  (e: 'fileClicked', file: RecentFile): void;
+  (e: 'removeClicked', file: RecentFile): void;
+}>();
+</script>
+
+<style scoped lang="scss">
+.sidebar-item {
+  --background: none;
+  border-radius: var(--parsec-radius-8);
+  border: solid 1px var(--parsec-color-light-primary-800);
+  --padding-start: 1rem;
+  --padding-end: 1rem;
+  --padding-top: 0.5rem;
+  --padding-bottom: 0.5rem;
+
+  .file-option {
+    color: var(--parsec-color-light-secondary-grey);
+    font-size: 1.2rem;
+    opacity: 1;
+    display: flex;
+    align-items: center;
+
+    &:hover {
+      color: var(--parsec-color-light-primary-30);
+    }
+  }
+
+  &:hover {
+    border: solid 1px var(--parsec-color-light-primary-30-opacity15);
+    cursor: pointer;
+
+    .file-option {
+      opacity: 1;
+    }
+  }
+
+  &:active,
+  &.item-selected {
+    --background: var(--parsec-color-light-primary-30-opacity15);
+  }
+
+  &-file-label {
+    position: relative;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    color: var(--parsec-color-light-primary-100);
+    width: 100%;
+  }
+}
+</style>
diff --git a/client/src/components/sidebar/index.ts b/client/src/components/sidebar/index.ts
index fc1878d2250..bb2d2e859f4 100644
--- a/client/src/components/sidebar/index.ts
+++ b/client/src/components/sidebar/index.ts
@@ -1,5 +1,6 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
+import SidebarRecentFileItem from '@/components/sidebar/SidebarRecentFileItem.vue';
 import SidebarWorkspaceItem from '@/components/sidebar/SidebarWorkspaceItem.vue';
 
-export { SidebarWorkspaceItem };
+export { SidebarRecentFileItem, SidebarWorkspaceItem };
diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index 62461a82d80..1861be8c814 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -702,6 +702,7 @@
         "manageOrganization": "Manage my organization",
         "organizationInfo": "Information",
         "goToHome": "My workspaces",
+        "recentDocuments": "Recent documents",
         "back": "Back",
         "trial": {
             "tag": "Trial version",
@@ -1695,6 +1696,7 @@
     },
     "fileViewers": {
         "openWithDefault": "Open with default application",
-        "openingFile": "Opening file..."
+        "openingFile": "Opening file...",
+        "fileTooBig": "File is too big to be opened using a viewer."
     }
 }
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index c97199fabd9..961657dce9b 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -702,6 +702,7 @@
         "manageOrganization": "Gérer mon organisation",
         "organizationInfo": "Informations",
         "goToHome": "Mes espaces",
+        "recentDocuments": "Documents récents",
         "back": "Retour",
         "trial": {
             "tag": "Version d'essai",
@@ -1695,6 +1696,7 @@
     },
     "fileViewers": {
         "openWithDefault": "Ouvrir avec l'application par défaut",
-        "openingFile": "Ouverture du fichier..."
+        "openingFile": "Ouverture du fichier...",
+        "fileTooBig": "Le fichier est trop large pour être ouvert avec un visualiseur."
     }
 }
diff --git a/client/src/services/fileOpener.ts b/client/src/services/fileOpener.ts
new file mode 100644
index 00000000000..60caeb42438
--- /dev/null
+++ b/client/src/services/fileOpener.ts
@@ -0,0 +1,117 @@
+// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
+
+import { detectFileContentType, FileContentType } from '@/common/fileTypes';
+import { entryStat, EntryStat, entryStatAt, FsPath, getSystemPath, isDesktop, WorkspaceHandle, WorkspaceHistoryEntryStat } from '@/parsec';
+import { navigateTo, Routes } from '@/router';
+import { Information, InformationLevel, InformationManager, PresentationMode } from '@/services/informationManager';
+import { recentFileManager } from '@/services/recentFiles';
+import { DateTime } from 'luxon';
+import { Base64, openSpinnerModal } from 'megashark-lib';
+
+interface OpenPathOptions {
+  skipViewers?: boolean;
+  atTime?: DateTime;
+}
+
+const OPEN_FILE_SIZE_LIMIT = 15_000_000;
+
+async function openWithSystem(
+  workspaceHandle: WorkspaceHandle,
+  entry: EntryStat | WorkspaceHistoryEntryStat,
+  informationManager: InformationManager,
+): Promise<void> {
+  if (entry.isFile()) {
+    recentFileManager.addFile({
+      entryId: entry.id,
+      path: entry.path,
+      workspaceHandle: workspaceHandle,
+      name: entry.name,
+    });
+  }
+
+  const result = await getSystemPath(workspaceHandle, entry.path);
+
+  if (!result.ok) {
+    await informationManager.present(
+      new Information({
+        message: entry.isFile() ? 'FoldersPage.open.fileFailed' : 'FoldersPage.open.folderFailed',
+        level: InformationLevel.Error,
+      }),
+      PresentationMode.Modal,
+    );
+  } else {
+    window.electronAPI.openFile(result.value);
+  }
+}
+
+async function openPath(
+  workspaceHandle: WorkspaceHandle,
+  path: FsPath,
+  informationManager: InformationManager,
+  options: OpenPathOptions,
+): Promise<void> {
+  let statsResult;
+  if (options.atTime) {
+    statsResult = await entryStatAt(workspaceHandle, path, options.atTime);
+  } else {
+    statsResult = await entryStat(workspaceHandle, path);
+  }
+  if (!statsResult.ok) {
+    await informationManager.present(
+      new Information({
+        message: 'FoldersPage.open.fileFailed',
+        level: InformationLevel.Error,
+      }),
+      PresentationMode.Modal,
+    );
+    return;
+  }
+
+  const entry = statsResult.value;
+
+  if (!entry.isFile()) {
+    await openWithSystem(workspaceHandle, entry, informationManager);
+    return;
+  }
+  if (isDesktop() && options.skipViewers) {
+    await openWithSystem(workspaceHandle, entry, informationManager);
+    return;
+  }
+
+  const modal = await openSpinnerModal('fileViewers.openingFile');
+  const contentType = await detectFileContentType(workspaceHandle, entry.path, options.atTime);
+
+  try {
+    if (!contentType || contentType.type === FileContentType.Unknown) {
+      await openWithSystem(workspaceHandle, entry, informationManager);
+    } else {
+      if ((entry as any).size > OPEN_FILE_SIZE_LIMIT) {
+        informationManager.present(
+          new Information({
+            message: 'fileViewers.fileTooBig',
+            level: InformationLevel.Warning,
+          }),
+          PresentationMode.Toast,
+        );
+        await openWithSystem(workspaceHandle, entry, informationManager);
+        return;
+      }
+
+      recentFileManager.addFile({
+        entryId: entry.id,
+        path: entry.path,
+        workspaceHandle: workspaceHandle,
+        name: entry.name,
+        contentType: contentType,
+      });
+
+      await navigateTo(Routes.Viewer, {
+        query: { workspaceHandle: workspaceHandle, documentPath: entry.path, fileTypeInfo: Base64.fromObject(contentType) },
+      });
+    }
+  } finally {
+    await modal.dismiss();
+  }
+}
+
+export { openPath };
diff --git a/client/src/services/recentFiles.ts b/client/src/services/recentFiles.ts
new file mode 100644
index 00000000000..529e60210ce
--- /dev/null
+++ b/client/src/services/recentFiles.ts
@@ -0,0 +1,52 @@
+// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
+
+import { DetectedFileType } from '@/common/fileTypes';
+import { EntryID, EntryName, FsPath, WorkspaceHandle } from '@/parsec';
+import { Ref, ref } from 'vue';
+
+interface RecentFile {
+  entryId: EntryID;
+  workspaceHandle: WorkspaceHandle;
+  path: FsPath;
+  name: EntryName;
+  contentType?: DetectedFileType;
+}
+
+const HISTORY_SIZE = 5;
+
+class RecentFileManager {
+  files: Ref<Array<RecentFile>> = ref([]);
+
+  constructor() {
+    this.files.value = new Array<RecentFile>();
+  }
+
+  addFile(file: RecentFile): void {
+    const exists = this.files.value.find((item) => item.entryId === file.entryId) !== undefined;
+    if (exists) {
+      return;
+    }
+    if (this.files.value.unshift(file) > HISTORY_SIZE) {
+      this.files.value.pop();
+    }
+  }
+
+  removeFile(file: RecentFile): void {
+    const index = this.files.value.findIndex((item) => item.entryId === file.entryId);
+    if (index !== -1) {
+      this.files.value.splice(index, 1);
+    }
+  }
+
+  resetHistory(): void {
+    this.files.value = new Array<RecentFile>();
+  }
+
+  getFiles(): Array<RecentFile> {
+    return this.files.value;
+  }
+}
+
+const recentFileManager = new RecentFileManager();
+
+export { RecentFile, recentFileManager };
diff --git a/client/src/views/files/FoldersPage.vue b/client/src/views/files/FoldersPage.vue
index 7b37a656bdb..523ba7961df 100644
--- a/client/src/views/files/FoldersPage.vue
+++ b/client/src/views/files/FoldersPage.vue
@@ -217,8 +217,6 @@ import {
   Clipboard,
   asyncComputed,
   MsSpinner,
-  openSpinnerModal,
-  Base64,
 } from 'megashark-lib';
 import * as parsec from '@/parsec';
 
@@ -249,9 +247,6 @@ import {
   EntryStat,
   WorkspaceStatFolderChildrenErrorTag,
   EntryStatFile,
-  getSystemPath,
-  WorkspaceHandle,
-  isDesktop,
   EntryName,
 } from '@/parsec';
 import { Routes, currentRouteIs, getCurrentRouteQuery, getDocumentPath, getWorkspaceHandle, navigateTo, watchRoute } from '@/router';
@@ -276,7 +271,7 @@ import { IonContent, IonPage, IonText, modalController, popoverController } from
 import { arrowRedo, copy, folderOpen, informationCircle, link, pencil, trashBin } from 'ionicons/icons';
 import { Ref, computed, inject, onMounted, onUnmounted, ref } from 'vue';
 import { EntrySyncedData, EventData, EventDistributor, EventDistributorKey, Events } from '@/services/eventDistributor';
-import { detectFileContentType, FileContentType } from '@/common/fileTypes';
+import { openPath } from '@/services/fileOpener';
 
 interface FoldersPageSavedData {
   displayState?: DisplayState;
@@ -330,7 +325,6 @@ const storageManager: StorageManager = inject(StorageManagerKey)!;
 const eventDistributor: EventDistributor = inject(EventDistributorKey)!;
 
 const FOLDERS_PAGE_DATA_KEY = 'FoldersPage';
-const OPEN_FILE_SIZE_LIMIT = 15_000_000;
 
 const sortProperty = ref(SortProperty.Name);
 const sortAsc = ref(true);
@@ -1180,22 +1174,6 @@ async function showHistory(entries: EntryModel[]): Promise<void> {
   });
 }
 
-async function openWithSystem(workspaceHandle: WorkspaceHandle, entry: EntryStatFile): Promise<void> {
-  const result = await getSystemPath(workspaceHandle, entry.path);
-
-  if (!result.ok) {
-    await informationManager.present(
-      new Information({
-        message: 'FoldersPage.open.fileFailed',
-        level: InformationLevel.Error,
-      }),
-      PresentationMode.Modal,
-    );
-  } else {
-    window.electronAPI.openFile(result.value);
-  }
-}
-
 async function openEntries(entries: EntryModel[]): Promise<void> {
   if (entries.length !== 1 || !workspaceInfo.value || !entries[0].isFile()) {
     return;
@@ -1206,37 +1184,7 @@ async function openEntries(entries: EntryModel[]): Promise<void> {
 
   const config = await storageManager.retrieveConfig();
 
-  if (isDesktop() && config.skipViewers) {
-    await openWithSystem(workspaceHandle, entry);
-    return;
-  }
-
-  const modal = await openSpinnerModal('fileViewers.openingFile');
-  const contentType = await detectFileContentType(workspaceHandle, entry.path);
-
-  try {
-    if (!contentType || contentType.type === FileContentType.Unknown) {
-      await openWithSystem(workspaceHandle, entry);
-    } else {
-      if (entry.size > OPEN_FILE_SIZE_LIMIT) {
-        informationManager.present(
-          new Information({
-            message: 'FILE TOO BIG',
-            level: InformationLevel.Warning,
-          }),
-          PresentationMode.Toast,
-        );
-        await openWithSystem(workspaceHandle, entry);
-        return;
-      }
-
-      await navigateTo(Routes.Viewer, {
-        query: { workspaceHandle: workspaceHandle, documentPath: entry.path, fileTypeInfo: Base64.fromObject(contentType) },
-      });
-    }
-  } finally {
-    await modal.dismiss();
-  }
+  await openPath(workspaceHandle, entry.path, informationManager, { skipViewers: config.skipViewers });
 }
 
 async function openGlobalContextMenu(event: Event): Promise<void> {
diff --git a/client/src/views/sidebar-menu/SidebarMenuPage.vue b/client/src/views/sidebar-menu/SidebarMenuPage.vue
index cf3806bcae7..64b6292e5f2 100644
--- a/client/src/views/sidebar-menu/SidebarMenuPage.vue
+++ b/client/src/views/sidebar-menu/SidebarMenuPage.vue
@@ -158,19 +158,19 @@
             <!-- list of favorite workspaces -->
             <!-- show only favorites -->
             <ion-list
-              class="list-workspaces favorites"
+              class="list-sidebar favorites"
               v-if="favoritesWorkspaces.length > 0"
             >
               <ion-header
                 lines="none"
-                class="list-workspaces-header menu-default"
+                class="list-sidebar-header menu-default"
               >
-                <div class="list-workspaces-header-favorites">
+                <div class="list-sidebar-header-favorites">
                   <ion-icon
-                    class="list-workspaces-header-favorites__icon"
+                    class="list-sidebar-header-favorites__icon"
                     :icon="star"
                   />
-                  <ion-text class="list-workspaces-header-favorites__text">
+                  <ion-text class="list-sidebar-header-favorites__text">
                     {{ $msTranslate('SideMenu.favorites') }}
                   </ion-text>
                 </div>
@@ -186,28 +186,23 @@
               />
             </ion-list>
 
-            <div
-              class="list-workspaces-divider"
-              v-if="favoritesWorkspaces.length > 0"
-            />
-
             <!-- list of workspaces -->
-            <ion-list class="list-workspaces">
+            <ion-list class="list-sidebar workspaces">
               <ion-header
                 lines="none"
-                class="list-workspaces-header menu-default"
+                class="list-sidebar-header menu-default"
               >
-                <div class="list-workspaces-header-title">
+                <div class="list-sidebar-header-title">
                   <ion-icon
-                    class="list-workspaces-header-title__icon"
+                    class="list-sidebar-header-title__icon"
                     :icon="business"
                   />
-                  <ion-text class="list-workspaces-header-title__text">
+                  <ion-text class="list-sidebar-header-title__text">
                     {{ $msTranslate('SideMenu.workspaces') }}
                   </ion-text>
                 </div>
                 <ion-icon
-                  class="list-workspaces-header__button"
+                  class="list-sidebar-header__button"
                   id="new-workspace"
                   :icon="add"
                   v-show="userInfo && userInfo.currentProfile !== UserProfile.Outsider"
@@ -215,7 +210,7 @@
                 />
               </ion-header>
               <ion-text
-                class="body list-workspaces__no-workspace"
+                class="body list-sidebar__no-workspace"
                 v-if="workspaces.length === 0"
               >
                 {{ $msTranslate('SideMenu.noWorkspace') }}
@@ -231,6 +226,43 @@
               />
             </ion-list>
           </div>
+
+          <div
+            class="list-sidebar-divider"
+            v-if="recentFileManager.getFiles().length > 0"
+          />
+
+          <!-- last opened files -->
+          <div class="file-workspaces">
+            <ion-list
+              class="list-sidebar list-file"
+              v-if="recentFileManager.getFiles().length > 0"
+            >
+              <ion-header
+                lines="none"
+                class="list-sidebar-header menu-default"
+              >
+                <div class="list-sidebar-header-title">
+                  <ion-icon
+                    class="list-sidebar-header-title__icon"
+                    :icon="documentIcon"
+                  />
+                  <ion-text class="llist-sidebar-header-title__text">
+                    {{ $msTranslate('SideMenu.recentDocuments') }}
+                  </ion-text>
+                </div>
+              </ion-header>
+
+              <sidebar-recent-file-item
+                v-for="file in recentFileManager.getFiles()"
+                :file="file"
+                :key="file.entryId"
+                @file-clicked="openRecentFile"
+                @remove-clicked="removeRecentFile"
+              />
+            </ion-list>
+          </div>
+
           <!-- manage organization -->
           <div
             v-show="currentRouteIsOrganizationManagementRoute()"
@@ -339,7 +371,7 @@ import { InformationManager, InformationManagerKey } from '@/services/informatio
 import useSidebarMenu from '@/services/sidebarMenu';
 import { StorageManager, StorageManagerKey } from '@/services/storageManager';
 import { formatExpirationTime, isTrialOrganizationDevice, getDurationBeforeExpiration } from '@/common/organization';
-import { SidebarWorkspaceItem } from '@/components/sidebar';
+import { SidebarWorkspaceItem, SidebarRecentFileItem } from '@/components/sidebar';
 import {
   GestureDetail,
   IonAvatar,
@@ -362,9 +394,24 @@ import {
   menuController,
   popoverController,
 } from '@ionic/vue';
-import { add, home, business, chevronBack, cog, informationCircle, people, pieChart, star, snow, warning } from 'ionicons/icons';
+import {
+  add,
+  home,
+  business,
+  chevronBack,
+  cog,
+  document as documentIcon,
+  informationCircle,
+  people,
+  pieChart,
+  star,
+  snow,
+  warning,
+} from 'ionicons/icons';
 import { Ref, computed, inject, onMounted, onUnmounted, ref, watch } from 'vue';
 import { Duration } from 'luxon';
+import { recentFileManager, RecentFile } from '@/services/recentFiles';
+import { openPath } from '@/services/fileOpener';
 
 const workspaces: Ref<Array<WorkspaceInfo>> = ref([]);
 const eventDistributor: EventDistributor = inject(EventDistributorKey)!;
@@ -535,6 +582,16 @@ async function openOrganizationChoice(event: Event): Promise<void> {
 async function openPricingLink(): Promise<void> {
   window.open(I18n.translate({ key: 'app.pricingLink' }), '_blank');
 }
+
+async function openRecentFile(file: RecentFile): Promise<void> {
+  const config = await storageManager.retrieveConfig();
+
+  await openPath(file.workspaceHandle, file.path, informationManager, { skipViewers: config.skipViewers });
+}
+
+async function removeRecentFile(file: RecentFile): Promise<void> {
+  recentFileManager.removeFile(file);
+}
 </script>
 
 <style lang="scss" scoped>
@@ -604,11 +661,13 @@ async function openPricingLink(): Promise<void> {
     z-index: 12;
   }
 
-  .organization-workspaces {
+  .organization-workspaces,
+  .file-workspaces {
     display: flex;
     flex-direction: column;
     gap: 1rem;
     padding: 0 0.75rem;
+    margin-bottom: 1rem;
   }
 }
 
@@ -763,12 +822,16 @@ ion-menu {
   user-select: none;
 }
 
-.list-workspaces {
+.list-sidebar {
   display: flex;
   flex-direction: column;
   flex: 1;
   gap: 0.5rem;
 
+  &.list-file {
+    margin: 1rem 0;
+  }
+
   &-header {
     display: flex;
     align-items: center;
@@ -825,7 +888,7 @@ ion-menu {
   }
 }
 
-.list-workspaces-divider {
+.list-sidebar-divider {
   background: var(--parsec-color-light-primary-30-opacity15);
   display: flex;
   justify-content: center;
diff --git a/client/src/views/workspaces/WorkspaceHistoryPage.vue b/client/src/views/workspaces/WorkspaceHistoryPage.vue
index 5e70cef2f50..b9745bcce6c 100644
--- a/client/src/views/workspaces/WorkspaceHistoryPage.vue
+++ b/client/src/views/workspaces/WorkspaceHistoryPage.vue
@@ -144,30 +144,19 @@
 <script setup lang="ts">
 import { IonPage, IonList, IonLabel, IonButtons, IonIcon, IonButton, IonListHeader, IonContent, IonText } from '@ionic/vue';
 import { computed, onBeforeUnmount, onMounted, ref, Ref, inject } from 'vue';
-import {
-  FsPath,
-  Path,
-  getWorkspaceInfo,
-  StartedWorkspaceInfo,
-  statFolderChildrenAt,
-  entryStatAt,
-  EntryName,
-  isDesktop,
-  WorkspaceHandle,
-  WorkspaceHistoryEntryStatFile,
-} from '@/parsec';
-import { MsCheckbox, MsSpinner, MsSearchInput, askQuestion, Answer, MsDatetimePicker, openSpinnerModal, Base64, I18n } from 'megashark-lib';
+import { FsPath, Path, getWorkspaceInfo, StartedWorkspaceInfo, statFolderChildrenAt, entryStatAt, EntryName } from '@/parsec';
+import { MsCheckbox, MsSpinner, MsSearchInput, askQuestion, Answer, MsDatetimePicker, I18n } from 'megashark-lib';
 import { DateTime } from 'luxon';
 import { StorageManager, StorageManagerKey } from '@/services/storageManager';
 import { RouterPathNode } from '@/components/header/HeaderBreadcrumbs.vue';
 import HeaderBreadcrumbs from '@/components/header/HeaderBreadcrumbs.vue';
 import { WorkspaceHistoryEntryCollection, WorkspaceHistoryEntryModel, HistoryFileListItem } from '@/components/files';
 import { chevronBack, chevronForward, warning } from 'ionicons/icons';
-import { currentRouteIs, getCurrentRouteQuery, getDocumentPath, getWorkspaceHandle, navigateTo, Routes } from '@/router';
+import { currentRouteIs, getCurrentRouteQuery, getDocumentPath, getWorkspaceHandle, Routes } from '@/router';
 import { FileOperationManager, FileOperationManagerKey } from '@/services/fileOperationManager';
 import { SortProperty } from '@/components/users';
-import { Information, InformationLevel, InformationManager, InformationManagerKey, PresentationMode } from '@/services/informationManager';
-import { detectFileContentType, FileContentType } from '@/common/fileTypes';
+import { InformationManager, InformationManagerKey } from '@/services/informationManager';
+import { openPath } from '@/services/fileOpener';
 
 const fileOperationManager: FileOperationManager = inject(FileOperationManagerKey)!;
 const storageManager: StorageManager = inject(StorageManagerKey)!;
@@ -187,7 +176,6 @@ let timeoutId: number | null = null;
 const resultFromSearch = ref(false);
 const error = ref('');
 const selectEntry: Ref<EntryName> = ref('');
-const OPEN_FILE_SIZE_LIMIT = 15_000_000;
 
 const allSelected = computed(() => {
   return entries.value.selectedCount() === entries.value.entriesCount();
@@ -330,16 +318,6 @@ async function selectAll(selected: boolean): Promise<void> {
   entries.value.selectAll(selected);
 }
 
-async function openWithSystem(_workspaceHandle: WorkspaceHandle, _entry: WorkspaceHistoryEntryStatFile): Promise<void> {
-  await informationManager.present(
-    new Information({
-      message: 'FoldersPage.open.fileFailed',
-      level: InformationLevel.Error,
-    }),
-    PresentationMode.Modal,
-  );
-}
-
 async function onEntryClicked(entry: WorkspaceHistoryEntryModel): Promise<void> {
   if (entry.isFile()) {
     if (!workspaceInfo.value) {
@@ -356,41 +334,10 @@ async function onEntryClicked(entry: WorkspaceHistoryEntryModel): Promise<void>
 
     const config = await storageManager.retrieveConfig();
 
-    if (isDesktop() && config.skipViewers) {
-      await openWithSystem(workspaceInfo.value.handle, entry as WorkspaceHistoryEntryStatFile);
-      return;
-    }
-
-    const modal = await openSpinnerModal('fileViewers.openingFile');
-    const contentType = await detectFileContentType(workspaceInfo.value.handle, entry.path, DateTime.fromJSDate(selectedDateTime.value));
-
-    try {
-      if (!contentType || contentType.type === FileContentType.Unknown) {
-        await openWithSystem(workspaceInfo.value.handle, entry as WorkspaceHistoryEntryStatFile);
-      } else {
-        if ((entry as WorkspaceHistoryEntryStatFile).size > OPEN_FILE_SIZE_LIMIT) {
-          informationManager.present(
-            new Information({
-              message: 'FILE TOO BIG',
-              level: InformationLevel.Warning,
-            }),
-            PresentationMode.Toast,
-          );
-          await openWithSystem(workspaceInfo.value.handle, entry as WorkspaceHistoryEntryStatFile);
-          return;
-        }
-        await navigateTo(Routes.Viewer, {
-          query: {
-            workspaceHandle: workspaceInfo.value.handle,
-            documentPath: entry.path,
-            fileTypeInfo: Base64.fromObject(contentType),
-            timestamp: selectedDateTime.value.getTime().toString(),
-          },
-        });
-      }
-    } finally {
-      await modal.dismiss();
-    }
+    await openPath(workspaceInfo.value.handle, entry.path, informationManager, {
+      skipViewers: config.skipViewers,
+      atTime: DateTime.fromJSDate(selectedDateTime.value),
+    });
   } else {
     backStack.push(currentPath.value);
     selectEntry.value = '';
diff --git a/client/tests/e2e/specs/workspaces_actions.spec.ts b/client/tests/e2e/specs/workspaces_actions.spec.ts
index b6e7d715fbd..5c6ed6ea17b 100644
--- a/client/tests/e2e/specs/workspaces_actions.spec.ts
+++ b/client/tests/e2e/specs/workspaces_actions.spec.ts
@@ -26,7 +26,7 @@ async function openContextMenu(page: Page, mode: Mode): Promise<void> {
     const wk = page.locator('.workspaces-container').locator('.workspace-list-item').nth(1);
     await wk.locator('.workspace-options').click();
   } else {
-    const wk = page.locator('.sidebar').locator('.list-workspaces').getByRole('listitem').nth(1);
+    const wk = page.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1);
     await wk.hover();
     await wk.locator('.workspace-option').click();
   }
@@ -79,7 +79,7 @@ for (const mode of ['grid', 'list', 'sidebar']) {
       const wk = connected.locator('.workspaces-container').locator('.workspace-list-item').nth(1);
       await wk.click({ button: 'right' });
     } else {
-      const wk = connected.locator('.sidebar').locator('.list-workspaces').getByRole('listitem').nth(1);
+      const wk = connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1);
       await wk.click({ button: 'right' });
     }
 
@@ -107,7 +107,7 @@ for (const mode of ['grid', 'list', 'sidebar']) {
       await toggleViewMode(connected);
       await connected.locator('.workspaces-container').locator('.workspace-list-item').nth(1).click();
     } else {
-      await connected.locator('.sidebar').locator('.list-workspaces').getByRole('listitem').nth(1).click();
+      await connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1).click();
     }
     await expect(connected).toHaveHeader(['Trademeet'], true, true);
   });