diff --git a/filemanager/package-lock.json b/filemanager/package-lock.json
index f46cbf286..e43113e9d 100644
--- a/filemanager/package-lock.json
+++ b/filemanager/package-lock.json
@@ -11,7 +11,7 @@
         "@fontsource/noto-sans": "^5.0.5",
         "combokeys": "^3.0.1",
         "filesize": "^10.0.7",
-        "pankow": "^0.4.1",
+        "pankow": "^0.4.2",
         "primeicons": "^6.0.1",
         "primevue": "^3.30.0",
         "superagent": "^8.0.9",
@@ -916,9 +916,9 @@
       }
     },
     "node_modules/pankow": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pankow/-/pankow-0.4.1.tgz",
-      "integrity": "sha512-jL8BoV8WMGMOOekIvVNimnidITN+K1LTeOJEYP1N3LEY8byQTWiLYSjIHn5noWLk/epvalnBwKp54VNc3bCv8g==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/pankow/-/pankow-0.4.2.tgz",
+      "integrity": "sha512-viWPCNH+qICmupZZLYQapPqxuRhxeVAs/rZ4ipHIu6x1+nZOHo4dIpNnzGIV5hSGGasWBOlyK52K7X3JB2TJMQ==",
       "dependencies": {
         "filesize": "^10.0.7",
         "monaco-editor": "^0.40.0",
diff --git a/filemanager/package.json b/filemanager/package.json
index 1715a5dd8..3febe6197 100644
--- a/filemanager/package.json
+++ b/filemanager/package.json
@@ -12,7 +12,7 @@
     "@fontsource/noto-sans": "^5.0.5",
     "combokeys": "^3.0.1",
     "filesize": "^10.0.7",
-    "pankow": "^0.4.1",
+    "pankow": "^0.4.2",
     "primeicons": "^6.0.1",
     "primevue": "^3.30.0",
     "superagent": "^8.0.9",
diff --git a/filemanager/src/App.vue b/filemanager/src/App.vue
index 89a651b3c..de4b63f46 100644
--- a/filemanager/src/App.vue
+++ b/filemanager/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <ConfirmDialog/>
-  <router-view></router-view>
+  <router-view :key="$route.fullPath"></router-view>
 </template>
 
 <script>
diff --git a/filemanager/src/views/Viewer.vue b/filemanager/src/views/Viewer.vue
index 22d7d8ac4..3233bb4e7 100644
--- a/filemanager/src/views/Viewer.vue
+++ b/filemanager/src/views/Viewer.vue
@@ -59,7 +59,13 @@ export default {
     }
 
     if (this.$refs.imageViewer.canHandle(this.item)) {
-      this.$refs.imageViewer.open(this.item, this.directoryModel.getFileUrl(this.filePath));
+      // collect other files in directory for prev/next action
+      const otherSupportedEntries = files.filter((item) => this.$refs.imageViewer.canHandle(item)).map((item) => {
+        item.resourceUrl = `/viewer/${this.resourceType}/${this.resourceId}${item.folderPath}/${item.fileName}`;
+        return item;
+      });
+
+      this.$refs.imageViewer.open(this.item, this.directoryModel.getFileUrl(this.filePath), otherSupportedEntries);
       this.active = 'imageViewer';
     } else if (this.$refs.textEditor.canHandle(this.item)) {
       const content = await this.directoryModel.getFile(this.filePath);