diff --git a/lib/Controller/FileController.php b/lib/Controller/FileController.php
index b480a30e9b..e1cccb3167 100644
--- a/lib/Controller/FileController.php
+++ b/lib/Controller/FileController.php
@@ -246,7 +246,8 @@ private function validate(?string $type = null, $identifier = null): DataRespons
 	 * List identification documents that need to be approved
 	 *
 	 * @param string|null $signer_uuid Signer UUID
-	 * @param list<string>|null $nodeIds The list of nodeIds (also called fileIds). It's the ids of files at Nextcloud
+	 * @param list<int>|null $fileIds The list of fileIds (database file IDs). It's the ids of LibreSign files
+	 * @param list<int>|null $nodeIds The list of nodeIds (also called fileIds). It's the ids of files at Nextcloud
 	 * @param list<int>|null $status Status could be none or many of 0 = draft, 1 = able to sign, 2 = partial signed, 3 = signed, 4 = deleted.
 	 * @param int|null $page the number of page to return
 	 * @param int|null $length Total of elements to return
@@ -266,6 +267,7 @@ public function list(
 		?int $page = null,
 		?int $length = null,
 		?string $signer_uuid = null,
+		?array $fileIds = null,
 		?array $nodeIds = null,
 		?array $status = null,
 		?int $start = null,
@@ -276,6 +278,7 @@ public function list(
 	): DataResponse {
 		$filter = array_filter([
 			'signer_uuid' => $signer_uuid,
+			'fileIds' => $fileIds,
 			'nodeIds' => $nodeIds,
 			'status' => $status,
 			'start' => $start,
@@ -355,6 +358,64 @@ public function getThumbnail(
 		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode, $mimeFallback);
 	}
 
+	/**
+	 * Return the thumbnail of a LibreSign file by fileId
+	 *
+	 * @param integer $fileId The LibreSign fileId (database id)
+	 * @param integer $x Width of generated file
+	 * @param integer $y Height of generated file
+	 * @param boolean $a Crop, boolean value, default false
+	 * @param boolean $forceIcon Force to generate a new thumbnail
+	 * @param string $mode To force a given mimetype for the file
+	 * @param boolean $mimeFallback If we have no preview enabled, we can redirect to the mime icon if any
+	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>|RedirectResponse<Http::STATUS_SEE_OTHER, array{}>
+	 *
+	 * 200: OK
+	 * 303: Redirect
+	 * 400: Bad request
+	 * 403: Forbidden
+	 * 404: Not found
+	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/file/thumbnail/file_id/{fileId}', requirements: ['apiVersion' => '(v1)'])]
+	public function getThumbnailByFileId(
+		int $fileId = -1,
+		int $x = 32,
+		int $y = 32,
+		bool $a = false,
+		bool $forceIcon = true,
+		string $mode = 'fill',
+		bool $mimeFallback = false,
+	) {
+		if ($fileId === -1 || $x === 0 || $y === 0) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		try {
+			$libreSignFile = $this->fileMapper->getById($fileId);
+			if ($libreSignFile->getUserId() !== $this->userSession->getUser()->getUID()) {
+				return new DataResponse([], Http::STATUS_FORBIDDEN);
+			}
+
+			if ($libreSignFile->getNodeType() === 'envelope') {
+				if ($mimeFallback) {
+					$url = $this->mimeIconProvider->getMimeIconUrl('folder');
+					if ($url) {
+						return new RedirectResponse($url);
+					}
+				}
+				return new DataResponse([], Http::STATUS_NOT_FOUND);
+			}
+
+			$node = $this->accountService->getPdfByUuid($libreSignFile->getUuid());
+		} catch (DoesNotExistException) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
+		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode, $mimeFallback);
+	}
+
 	/**
 	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>|RedirectResponse<Http::STATUS_SEE_OTHER, array{}>
 	 */
diff --git a/lib/Db/SignRequestMapper.php b/lib/Db/SignRequestMapper.php
index 9380c2380c..f1586d7279 100644
--- a/lib/Db/SignRequestMapper.php
+++ b/lib/Db/SignRequestMapper.php
@@ -613,7 +613,15 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 			}
 			if (!empty($filter['nodeIds'])) {
 				$qb->andWhere(
-					$qb->expr()->in('f.node_id', $qb->createNamedParameter($filter['nodeIds'], IQueryBuilder::PARAM_STR_ARRAY))
+					$qb->expr()->orX(
+						$qb->expr()->in('f.node_id', $qb->createNamedParameter($filter['nodeIds'], IQueryBuilder::PARAM_INT_ARRAY)),
+						$qb->expr()->in('f.signed_node_id', $qb->createNamedParameter($filter['nodeIds'], IQueryBuilder::PARAM_INT_ARRAY))
+					)
+				);
+			}
+			if (!empty($filter['fileIds'])) {
+				$qb->andWhere(
+					$qb->expr()->in('f.id', $qb->createNamedParameter($filter['fileIds'], IQueryBuilder::PARAM_INT_ARRAY))
 				);
 			}
 			if (!empty($filter['status'])) {
diff --git a/openapi-full.json b/openapi-full.json
index 7e7453ff8a..eb067a38c4 100644
--- a/openapi-full.json
+++ b/openapi-full.json
@@ -4456,6 +4456,19 @@
                             "nullable": true
                         }
                     },
+                    {
+                        "name": "fileIds[]",
+                        "in": "query",
+                        "description": "The list of fileIds (database file IDs). It's the ids of LibreSign files",
+                        "schema": {
+                            "type": "array",
+                            "nullable": true,
+                            "items": {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        }
+                    },
                     {
                         "name": "nodeIds[]",
                         "in": "query",
@@ -4464,7 +4477,8 @@
                             "type": "array",
                             "nullable": true,
                             "items": {
-                                "type": "string"
+                                "type": "integer",
+                                "format": "int64"
                             }
                         }
                     },
@@ -4819,6 +4833,233 @@
                 }
             }
         },
+        "/ocs/v2.php/apps/libresign/api/{apiVersion}/file/thumbnail/file_id/{fileId}": {
+            "get": {
+                "operationId": "file-get-thumbnail-by-file-id",
+                "summary": "Return the thumbnail of a LibreSign file by fileId",
+                "tags": [
+                    "file"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "apiVersion",
+                        "in": "path",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "v1"
+                            ],
+                            "default": "v1"
+                        }
+                    },
+                    {
+                        "name": "fileId",
+                        "in": "path",
+                        "description": "The LibreSign fileId (database id)",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": -1
+                        }
+                    },
+                    {
+                        "name": "x",
+                        "in": "query",
+                        "description": "Width of generated file",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": 32
+                        }
+                    },
+                    {
+                        "name": "y",
+                        "in": "query",
+                        "description": "Height of generated file",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": 32
+                        }
+                    },
+                    {
+                        "name": "a",
+                        "in": "query",
+                        "description": "Crop, boolean value, default false",
+                        "schema": {
+                            "type": "integer",
+                            "default": 0,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "forceIcon",
+                        "in": "query",
+                        "description": "Force to generate a new thumbnail",
+                        "schema": {
+                            "type": "integer",
+                            "default": 1,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "mode",
+                        "in": "query",
+                        "description": "To force a given mimetype for the file",
+                        "schema": {
+                            "type": "string",
+                            "default": "fill"
+                        }
+                    },
+                    {
+                        "name": "mimeFallback",
+                        "in": "query",
+                        "description": "If we have no preview enabled, we can redirect to the mime icon if any",
+                        "schema": {
+                            "type": "integer",
+                            "default": 0,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "content": {
+                            "*/*": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad request",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not found",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "303": {
+                        "description": "Redirect",
+                        "headers": {
+                            "Location": {
+                                "schema": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/ocs/v2.php/apps/libresign/api/{apiVersion}/file": {
             "post": {
                 "operationId": "file-save",
diff --git a/openapi.json b/openapi.json
index 1cc8c82265..7d7c0a3b28 100644
--- a/openapi.json
+++ b/openapi.json
@@ -4306,6 +4306,19 @@
                             "nullable": true
                         }
                     },
+                    {
+                        "name": "fileIds[]",
+                        "in": "query",
+                        "description": "The list of fileIds (database file IDs). It's the ids of LibreSign files",
+                        "schema": {
+                            "type": "array",
+                            "nullable": true,
+                            "items": {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        }
+                    },
                     {
                         "name": "nodeIds[]",
                         "in": "query",
@@ -4314,7 +4327,8 @@
                             "type": "array",
                             "nullable": true,
                             "items": {
-                                "type": "string"
+                                "type": "integer",
+                                "format": "int64"
                             }
                         }
                     },
@@ -4669,6 +4683,233 @@
                 }
             }
         },
+        "/ocs/v2.php/apps/libresign/api/{apiVersion}/file/thumbnail/file_id/{fileId}": {
+            "get": {
+                "operationId": "file-get-thumbnail-by-file-id",
+                "summary": "Return the thumbnail of a LibreSign file by fileId",
+                "tags": [
+                    "file"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "apiVersion",
+                        "in": "path",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "v1"
+                            ],
+                            "default": "v1"
+                        }
+                    },
+                    {
+                        "name": "fileId",
+                        "in": "path",
+                        "description": "The LibreSign fileId (database id)",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": -1
+                        }
+                    },
+                    {
+                        "name": "x",
+                        "in": "query",
+                        "description": "Width of generated file",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": 32
+                        }
+                    },
+                    {
+                        "name": "y",
+                        "in": "query",
+                        "description": "Height of generated file",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "default": 32
+                        }
+                    },
+                    {
+                        "name": "a",
+                        "in": "query",
+                        "description": "Crop, boolean value, default false",
+                        "schema": {
+                            "type": "integer",
+                            "default": 0,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "forceIcon",
+                        "in": "query",
+                        "description": "Force to generate a new thumbnail",
+                        "schema": {
+                            "type": "integer",
+                            "default": 1,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "mode",
+                        "in": "query",
+                        "description": "To force a given mimetype for the file",
+                        "schema": {
+                            "type": "string",
+                            "default": "fill"
+                        }
+                    },
+                    {
+                        "name": "mimeFallback",
+                        "in": "query",
+                        "description": "If we have no preview enabled, we can redirect to the mime icon if any",
+                        "schema": {
+                            "type": "integer",
+                            "default": 0,
+                            "enum": [
+                                0,
+                                1
+                            ]
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "content": {
+                            "*/*": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad request",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not found",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "303": {
+                        "description": "Redirect",
+                        "headers": {
+                            "Location": {
+                                "schema": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/ocs/v2.php/apps/libresign/api/{apiVersion}/file": {
             "post": {
                 "operationId": "file-save",
diff --git a/src/Components/File/File.vue b/src/Components/File/File.vue
index 87d8926c09..56565a7adc 100644
--- a/src/Components/File/File.vue
+++ b/src/Components/File/File.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div v-if="currentNodeId > 0 && currentFile" class="content-file" @click="openSidebar">
+	<div v-if="currentFileId > 0 && currentFile" class="content-file" @click="openSidebar">
 		<img v-if="previewUrl && backgroundFailed !== true"
 			ref="previewImg"
 			alt=""
@@ -28,22 +28,20 @@ import FileIcon from 'vue-material-design-icons/File.vue'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 
 import { useFilesStore } from '../../store/files.js'
+import { useSidebarStore } from '../../store/sidebar.js'
 
 export default {
 	name: 'File',
 	components: {
 		FileIcon,
 	},
-	props: {
-		nodeId: {
-			type: Number,
-			default: 0,
-			required: false,
-		},
-	},
 	setup() {
 		const filesStore = useFilesStore()
-		return { filesStore }
+		const sidebarStore = useSidebarStore()
+		return {
+			filesStore,
+			sidebarStore,
+		}
 	},
 	data() {
 		return {
@@ -53,14 +51,11 @@ export default {
 		}
 	},
 	computed: {
-		currentNodeId() {
-			if (this.nodeId) {
-				return this.nodeId
-			}
-			return this.filesStore.selectedNodeId
+		currentFileId() {
+			return this.filesStore.selectedFileId
 		},
 		currentFile() {
-			return this.filesStore.files[this.currentNodeId]
+			return this.filesStore.files[this.currentFileId]
 		},
 		previewUrl() {
 			if (this.backgroundFailed === true) {
@@ -76,6 +71,10 @@ export default {
 				previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/{nodeId}', {
 					nodeId: this.currentFile.nodeId,
 				})
+			} else if (this.currentFile.id) {
+				previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/file_id/{fileId}', {
+					fileId: this.currentFile.id,
+				})
 			} else {
 				previewUrl = window.location.origin + generateUrl('/core/preview?fileId={fileid}', {
 					fileid: this.currentFile.id,
@@ -96,7 +95,8 @@ export default {
 	},
 	methods: {
 		openSidebar() {
-			this.filesStore.selectFile(this.currentNodeId)
+			this.filesStore.selectFile(this.currentFileId)
+			this.sidebarStore.activeRequestSignatureTab()
 		},
 		statusToClass(status) {
 			switch (Number(status)) {
diff --git a/src/Components/Request/RequestPicker.vue b/src/Components/Request/RequestPicker.vue
index 79966654b3..f6e0aff65c 100644
--- a/src/Components/Request/RequestPicker.vue
+++ b/src/Components/Request/RequestPicker.vue
@@ -122,6 +122,7 @@ import UploadProgress from '../UploadProgress.vue'
 
 import { useActionsMenuStore } from '../../store/actionsmenu.js'
 import { useFilesStore } from '../../store/files.js'
+import { useSidebarStore } from '../../store/sidebar.js'
 
 export default {
 	name: 'RequestPicker',
@@ -150,9 +151,11 @@ export default {
 	setup() {
 		const actionsMenuStore = useActionsMenuStore()
 		const filesStore = useFilesStore()
+		const sidebarStore = useSidebarStore()
 		return {
 			actionsMenuStore,
 			filesStore,
+			sidebarStore,
 		}
 	},
 	data() {
@@ -278,6 +281,7 @@ export default {
 			})
 				.then((nodeId) => {
 					this.filesStore.selectFile(nodeId)
+					this.sidebarStore.activeRequestSignatureTab()
 				})
 				.catch((error) => {
 					if (error.code === 'ERR_CANCELED') {
@@ -338,6 +342,7 @@ export default {
 			})
 				.then((nodeId) => {
 					this.filesStore.selectFile(nodeId)
+					this.sidebarStore.activeRequestSignatureTab()
 					this.closeModalUploadFromUrl()
 				})
 				.catch(({ response }) => {
@@ -373,6 +378,7 @@ export default {
 					})
 						.then((nodeId) => {
 							this.filesStore.selectFile(nodeId)
+							this.sidebarStore.activeRequestSignatureTab()
 						})
 						.catch(({ response }) => {
 							showError(response?.data?.ocs?.data?.message || this.t('libresign', 'Upload failed'))
@@ -395,6 +401,7 @@ export default {
 			})
 				.then((nodeId) => {
 					this.filesStore.selectFile(nodeId)
+					this.sidebarStore.activeRequestSignatureTab()
 				})
 				.catch(({ response }) => {
 					showError(response.data.ocs.data.message)
diff --git a/src/Components/RightSidebar/AppFilesTab.vue b/src/Components/RightSidebar/AppFilesTab.vue
index 011d696ea6..358e0a6cf8 100644
--- a/src/Components/RightSidebar/AppFilesTab.vue
+++ b/src/Components/RightSidebar/AppFilesTab.vue
@@ -21,6 +21,7 @@ import { generateRemoteUrl } from '@nextcloud/router'
 import RequestSignatureTab from '../RightSidebar/RequestSignatureTab.vue'
 
 import { useFilesStore } from '../../store/files.js'
+import { useSidebarStore } from '../../store/sidebar.js'
 
 export default {
 	name: 'AppFilesTab',
@@ -29,7 +30,11 @@ export default {
 	},
 	setup() {
 		const filesStore = useFilesStore()
-		return { filesStore }
+		const sidebarStore = useSidebarStore()
+		return {
+			filesStore,
+			sidebarStore,
+		}
 	},
 	data() {
 		return {
@@ -60,6 +65,7 @@ export default {
 
 			await this.filesStore.addFile(pendingEnvelope)
 			this.filesStore.selectFile(pendingEnvelope.nodeId)
+			this.sidebarStore.activeRequestSignatureTab()
 			delete window.OCA.Libresign.pendingEnvelope
 
 			this.$nextTick(() => {
@@ -99,7 +105,6 @@ export default {
 
 		disconnectTitleObserver() {
 			if (this.sidebarTitleObserver) {
-				console.log('Disconnecting sidebar title observer')
 				this.sidebarTitleObserver.disconnect()
 				this.sidebarTitleObserver = null
 			}
@@ -112,7 +117,15 @@ export default {
 
 			this.disconnectTitleObserver()
 
-			if (this.filesStore.selectedNodeId === fileInfo.id) {
+			const fileId = await this.filesStore.selectFileByNodeId(fileInfo.id)
+			if (fileId) {
+				this.$nextTick(() => {
+					const titleElement = document.querySelector('.app-sidebar-header__mainname')
+					if (titleElement) {
+						titleElement.textContent = fileInfo.name
+						titleElement.setAttribute('title', fileInfo.name)
+					}
+				})
 				return
 			}
 
@@ -123,7 +136,8 @@ export default {
 					.replace(/\/\/$/, '/'),
 				signers: [],
 			})
-			this.filesStore.selectFile(fileInfo.id)
+			this.filesStore.selectFile(-fileInfo.id)
+			this.sidebarStore.activeRequestSignatureTab()
 
 			this.$nextTick(() => {
 				const titleElement = document.querySelector('.app-sidebar-header__mainname')
@@ -146,7 +160,7 @@ export default {
 			emit(`files:node:${eventType}`, resultToNode(result.data))
 		},
 
-		async handleLibreSignFileChangeWithNodeId(nodeId, eventType) {
+		async handleLibreSignFileChangeAtCurretntFolder() {
 			const client = getClient()
 			const propfindPayload = getDefaultPropfind()
 			const rootPath = getRootPath()
@@ -169,7 +183,7 @@ export default {
 			if (path) {
 				await this.handleLibreSignFileChangeWithPath(path, eventType)
 			} else if (nodeId) {
-				await this.handleLibreSignFileChangeWithNodeId(nodeId, eventType)
+				await this.handleLibreSignFileChangeAtCurretntFolder()
 			}
 		},
 
diff --git a/src/Components/RightSidebar/RequestSignatureTab.vue b/src/Components/RightSidebar/RequestSignatureTab.vue
index 56a68c895c..0586e8d62d 100644
--- a/src/Components/RightSidebar/RequestSignatureTab.vue
+++ b/src/Components/RightSidebar/RequestSignatureTab.vue
@@ -375,7 +375,9 @@ export default {
 			showEnvelopeFilesDialog: false,
 			infoIcon: svgInfo,
 			adminSignatureFlow: '',
-			lastSyncedNodeId: null,
+			lastSyncedFileId: null,
+			debouncedSave: null,
+			debouncedTabChange: null,
 		}
 	},
 	computed: {
@@ -594,11 +596,11 @@ export default {
 		signers(signers) {
 			this.init(signers)
 		},
-		'filesStore.selectedNodeId': {
-			handler(newNodeId, oldNodeId) {
-				if (newNodeId && newNodeId !== this.lastSyncedNodeId) {
+		'filesStore.selectedFileId': {
+			handler(newFileId, oldFileId) {
+				if (newFileId && newFileId !== this.lastSyncedFileId) {
 					this.syncPreserveOrderWithFile()
-					this.lastSyncedNodeId = newNodeId
+					this.lastSyncedFileId = newFileId
 				}
 			},
 			immediate: true,
@@ -618,7 +620,7 @@ export default {
 		unsubscribe('libresign:edit-signer')
 	},
 	created() {
-		this.$set(this, 'methods', loadState('libresign', 'identify_methods'))
+		this.$set(this, 'methods', loadState('libresign', 'identify_methods', []))
 		this.$set(this, 'document', loadState('libresign', 'file_info', {}))
 
 		this.debouncedSave = debounce(async () => {
@@ -683,7 +685,7 @@ export default {
 
 			const flow = file.signatureFlow
 
-			this.lastSyncedNodeId = this.filesStore.selectedNodeId
+			this.lastSyncedFileId = this.filesStore.selectedFileId
 
 			if ((flow === 'ordered_numeric' || flow === 2) && !this.isAdminFlowForced) {
 				this.preserveOrder = true
diff --git a/src/store/files.js b/src/store/files.js
index 4bfa1a373c..311ea66d43 100644
--- a/src/store/files.js
+++ b/src/store/files.js
@@ -25,7 +25,7 @@ export const useFilesStore = function(...args) {
 		state: () => {
 			return {
 				files: {},
-				selectedNodeId: 0,
+				selectedFileId: 0,
 				identifyingSigner: false,
 				loading: false,
 				canRequestSign: loadState('libresign', 'can_request_sign', false),
@@ -37,44 +37,64 @@ export const useFilesStore = function(...args) {
 
 		actions: {
 			async addFile(file) {
-				if (!file.nodeId) {
-					console.warn('[LibreSign] File must have nodeId:', file)
+				if (!file.id && !file.nodeId) {
+					console.warn('[LibreSign] File must have id or nodeId:', file)
 					return
 				}
 
-				const nodeId = file.nodeId
+				const key = file.id || (file.nodeId ? -file.nodeId : null)
 				const fileData = file
 
 				if (fileData.signers) {
 					this.addUniqueIdentifierToAllSigners(fileData.signers)
 				}
 
-				const existingFile = this.files[nodeId]
+				const existingFile = this.files[key]
 				if (existingFile?.settings) {
 					fileData.settings = { ...existingFile.settings, ...fileData.settings }
 				}
 
-				set(this.files, nodeId, fileData)
+				set(this.files, key, fileData)
 
-				if (!this.ordered.includes(nodeId)) {
-					this.ordered.push(nodeId)
+				if (!this.ordered.includes(key)) {
+					this.ordered.push(key)
 				}
 			},
-			selectFile(nodeId) {
-				this.selectedNodeId = nodeId ?? 0
-				if (this.selectedNodeId === 0) {
+			selectFile(fileId) {
+				this.selectedFileId = fileId ?? 0
+				if (this.selectedFileId === 0) {
 					const signStore = useSignStore()
 					signStore.reset()
 					return
 				}
-				const sidebarStore = useSidebarStore()
-				sidebarStore.activeRequestSignatureTab()
 			},
-			getNodeIdByFileId(fileId) {
-				if (!fileId) return null
-				for (const [nodeId, file] of Object.entries(this.files)) {
-					if (file.id === fileId) {
-						return parseInt(nodeId)
+			async selectFileByNodeId(nodeId) {
+				let fileId = this.getFileIdByNodeId(nodeId)
+
+				if (!fileId || fileId < 0) {
+					const files = await this.getAllFiles({
+						'nodeIds[]': [nodeId],
+						force_fetch: true,
+					})
+
+					for (const [key, file] of Object.entries(files)) {
+						this.addFile(file)
+						fileId = file.id
+						break
+					}
+				}
+
+				if (!fileId) {
+					return null
+				}
+
+				this.selectFile(fileId)
+				return fileId
+			},
+			getFileIdByNodeId(nodeId) {
+				for (const [key, file] of Object.entries(this.files)) {
+					if (file.nodeId === nodeId) {
+						return file.id || key
 					}
 				}
 				return null
@@ -83,13 +103,18 @@ export const useFilesStore = function(...args) {
 				if (typeof file === 'object' && file !== null) {
 					return file
 				}
-				return this.files[this.selectedNodeId] || emptyFile
+				return this.files[this.selectedFileId] || emptyFile
 			},
 			async flushSelectedFile() {
 				const files = await this.getAllFiles({
-					'nodeIds[]': [this.selectedNodeId],
+					'fileIds[]': [this.selectedFileId],
 				})
-				this.addFile(files[this.selectedNodeId])
+				for (const [key, file] of Object.entries(files)) {
+					if (parseInt(key) === this.selectedFileId) {
+						this.addFile(file)
+						break
+					}
+				}
 			},
 			async addFilesToEnvelope(envelopeUuid, formData, options = {}) {
 				return await axios.post(
@@ -107,8 +132,8 @@ export const useFilesStore = function(...args) {
 						const addedFiles = data.ocs.data.files || []
 						const newFilesCount = data.ocs.data.filesCount || 0
 
-						if (this.selectedNodeId && this.files[this.selectedNodeId]) {
-							set(this.files[this.selectedNodeId], 'filesCount', newFilesCount)
+						if (this.selectedFileId && this.files[this.selectedFileId]) {
+							set(this.files[this.selectedFileId], 'filesCount', newFilesCount)
 						}
 
 						return {
@@ -143,9 +168,9 @@ export const useFilesStore = function(...args) {
 
 				return await Promise.all(deletePromises)
 					.then(() => {
-						if (this.files[this.selectedNodeId] && this.files[this.selectedNodeId].filesCount) {
-							const newCount = Math.max(0, this.files[this.selectedNodeId].filesCount - fileIds.length)
-							set(this.files[this.selectedNodeId], 'filesCount', newCount)
+						if (this.files[this.selectedFileId] && this.files[this.selectedFileId].filesCount) {
+							const newCount = Math.max(0, this.files[this.selectedFileId].filesCount - fileIds.length)
+							set(this.files[this.selectedFileId], 'filesCount', newCount)
 						}
 
 						const isSingle = fileIds.length === 1
@@ -173,7 +198,7 @@ export const useFilesStore = function(...args) {
 			},
 			hasSigners(file) {
 				file = this.getFile(file)
-				if (this.selectedNodeId === 0) {
+				if (this.selectedFileId <= 0) {
 					return false
 				}
 				if (!Object.hasOwn(file, 'signers')) {
@@ -250,7 +275,7 @@ export const useFilesStore = function(...args) {
 					&& file?.signers?.length > 0
 			},
 			getSubtitle() {
-				if (this.selectedNodeId === 0) {
+				if (this.selectedFileId <= 0) {
 					return ''
 				}
 				const file = this.getFile()
@@ -301,7 +326,7 @@ export const useFilesStore = function(...args) {
 					signer.signingOrder = maxOrder + 1
 				}
 				this.getFile().signers.push(signer)
-				const selected = this.selectedNodeId
+				const selected = this.selectedFileId
 				this.selectFile(-1) // to force reactivity
 				this.selectFile(selected) // to force reactivity
 			},
@@ -317,13 +342,13 @@ export const useFilesStore = function(...args) {
 				}
 
 				set(
-					this.files[this.selectedNodeId],
+					this.files[this.selectedFileId],
 					'signers',
-					this.files[this.selectedNodeId].signers.filter((i) => i.identify !== signer.identify),
+					this.files[this.selectedFileId].signers.filter((i) => i.identify !== signer.identify),
 				)
 
 				if (file.signatureFlow === 'ordered_numeric' && signer.signingOrder) {
-					this.files[this.selectedNodeId].signers.forEach((s) => {
+					this.files[this.selectedFileId].signers.forEach((s) => {
 						if (s.signingOrder && s.signingOrder > signer.signingOrder) {
 							s.signingOrder -= 1
 						}
@@ -337,19 +362,19 @@ export const useFilesStore = function(...args) {
 						? '/apps/libresign/api/v1/file/file_id/{fileId}'
 						: '/apps/libresign/api/v1/sign/file_id/{fileId}'
 					const params = deleteFile ? { deleteFile: true } : {}
-					const nodeId = file.nodeId
+					const fileId = file.id
 					await axios.delete(generateOcsUrl(url, {
-						fileId: file.id,
+						fileId: fileId,
 					}), { params })
 						.then(async () => {
-							if (this.selectedNodeId === file.nodeId) {
+							if (this.selectedFileId === fileId) {
 								const sidebarStore = useSidebarStore()
 								sidebarStore.hideSidebar()
-								this.selectedNodeId = 0
+								this.selectedFileId = 0
 							}
 
-							del(this.files, file.nodeId)
-							const index = this.ordered.indexOf(file.nodeId)
+							del(this.files, fileId)
+							const index = this.ordered.indexOf(fileId)
 							if (index > -1) {
 								this.ordered.splice(index, 1)
 							}
@@ -357,10 +382,10 @@ export const useFilesStore = function(...args) {
 				}
 
 			},
-			async deleteMultiple(nodeIds, deleteFile) {
+			async deleteMultiple(fileIds, deleteFile) {
 				this.loading = true
-				for (const nodeId of nodeIds) {
-					await this.delete(this.files[nodeId], deleteFile)
+				for (const fileId of fileIds) {
+					await this.delete(this.files[fileId], deleteFile)
 				}
 				this.loading = false
 			},
@@ -372,9 +397,9 @@ export const useFilesStore = function(...args) {
 				})
 					.then((response) => {
 						if (response.data?.ocs?.meta?.status === 'ok') {
-							const nodeId = Object.keys(this.files).find(id => this.files[id].uuid === uuid)
-							if (nodeId && this.files[nodeId]) {
-								this.files[nodeId].name = newName
+							const fileId = Object.keys(this.files).find(key => this.files[key].uuid === uuid)
+							if (fileId && this.files[fileId]) {
+								this.files[fileId].name = newName
 							}
 							return true
 						}
@@ -491,10 +516,10 @@ export const useFilesStore = function(...args) {
 					identificationDocumentStore.setWaitingApproval(response.data.ocs.data.settings.identificationDocumentsWaitingApproval)
 				}
 
-				if (this.selectedNodeId && !this.files[this.selectedNodeId]) {
+				if (this.selectedFileId && !this.files[this.selectedFileId]) {
 					const sidebarStore = useSidebarStore()
 					sidebarStore.hideSidebar()
-					this.selectedNodeId = 0
+					this.selectedFileId = 0
 				}
 
 				this.loading = false
@@ -509,7 +534,8 @@ export const useFilesStore = function(...args) {
 			filesSorted() {
 				return this.ordered.map(key => this.files[key])
 			},
-			async saveOrUpdateSignatureRequest({ visibleElements = [], signers = null, uuid = null, fileId = null, status = 0, signatureFlow = null } = {}) {
+			async saveOrUpdateSignatureRequest({ visibleElements = [], signers = null, uuid = null, status = 0, signatureFlow = null } = {}) {
+				const currentFileKey = this.selectedFileId
 				const file = this.getFile()
 
 				let flowValue = signatureFlow || file.signatureFlow
@@ -520,10 +546,10 @@ export const useFilesStore = function(...args) {
 
 				const config = {
 					url: generateOcsUrl('/apps/libresign/api/v1/request-signature'),
-					method: uuid || file.uuid ? 'patch' : 'post',
+					method: uuid || file.id ? 'patch' : 'post',
 					data: {
 						name: file?.name,
-						users: signers || file.signers || [],
+						users: signers || file?.signers || [],
 						visibleElements,
 						status,
 						signatureFlow: flowValue,
@@ -532,7 +558,7 @@ export const useFilesStore = function(...args) {
 
 				if (uuid || file.uuid) {
 					config.data.uuid = uuid || file.uuid
-				} else if (file.id) {
+				} else if (file.id && file.id > 0) {
 					config.data.file = { fileId: file.id }
 				} else if (file.files) {
 					config.data.files = file.files
@@ -552,26 +578,37 @@ export const useFilesStore = function(...args) {
 				const responseFile = data?.ocs?.data
 
 				if (file.nodeType === 'envelope' && typeof file.nodeId === 'string' && responseFile.nodeId !== file.nodeId) {
-					delete this.files[file.nodeId]
-					const index = this.ordered.indexOf(file.nodeId)
+					delete this.files[this.selectedFileId]
+					const index = this.ordered.indexOf(this.selectedFileId)
 					if (index !== -1) {
 						this.ordered.splice(index, 1)
 					}
 				}
 
-				if (responseFile.nodeId) {
-					const nodeId = responseFile.nodeId
-					const existingFile = this.files[file.nodeId] || this.files[nodeId]
+				let newFileKey = responseFile.id
+				if (this.selectedFileId !== null && this.selectedFileId !== newFileKey) {
+					if (this.selectedFileId < 0 && this.files[this.selectedFileId]) {
+						delete this.files[this.selectedFileId]
+						const index = this.ordered.indexOf(this.selectedFileId)
+						if (index !== -1) {
+							this.ordered[index] = newFileKey
+						}
+						this.selectedFileId = newFileKey
+					}
+				}
+
+				if (file.id) {
+					const existingFile = this.files[newFileKey]
 					if (existingFile?.settings) {
 						responseFile.settings = { ...existingFile.settings, ...responseFile.settings }
 					}
-					set(this.files, nodeId, responseFile)
-					this.addUniqueIdentifierToAllSigners(this.files[nodeId].signers)
-					if (!this.ordered.includes(nodeId)) {
-						this.ordered.push(nodeId)
+					set(this.files, newFileKey, responseFile)
+					this.addUniqueIdentifierToAllSigners(this.files[newFileKey].signers)
+					if (!this.ordered.includes(newFileKey)) {
+						this.ordered.push(newFileKey)
 					}
-					if (this.selectedNodeId === file.nodeId) {
-						this.selectedNodeId = nodeId
+					if (this.selectedFileId === currentFileKey) {
+						this.selectedFileId = newFileKey
 					}
 				} else {
 					this.addFile(responseFile)
diff --git a/src/store/sign.js b/src/store/sign.js
index c230b29763..33f6877cb6 100644
--- a/src/store/sign.js
+++ b/src/store/sign.js
@@ -38,7 +38,6 @@ export const useSignStore = defineStore('sign', {
 
 			const file = {
 				id: loadState('libresign', 'id', 0),
-				nodeId: loadState('libresign', 'nodeId', 0),
 				name: loadState('libresign', 'filename', ''),
 				description: loadState('libresign', 'description', ''),
 				status: loadState('libresign', 'status', ''),
@@ -48,10 +47,11 @@ export const useSignStore = defineStore('sign', {
 				uuid: loadState('libresign', 'uuid', null),
 				signers: loadState('libresign', 'signers', []),
 			}
-			this.setFileToSign(file)
 			const filesStore = useFilesStore()
 			await filesStore.addFile(file)
-			filesStore.selectedNodeId = file.nodeId
+			filesStore.selectFile(file.id)
+			this.setFileToSign(file)
+			this.sidebarStore.activeSignTab()
 		},
 		setFileToSign(file) {
 			if (file) {
diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts
index dcd37fbc92..230a02a3d6 100644
--- a/src/types/openapi/openapi-full.ts
+++ b/src/types/openapi/openapi-full.ts
@@ -604,6 +604,23 @@ export type paths = {
         patch?: never;
         trace?: never;
     };
+    "/ocs/v2.php/apps/libresign/api/{apiVersion}/file/thumbnail/file_id/{fileId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Return the thumbnail of a LibreSign file by fileId */
+        get: operations["file-get-thumbnail-by-file-id"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/ocs/v2.php/apps/libresign/api/{apiVersion}/file": {
         parameters: {
             query?: never;
@@ -3184,8 +3201,10 @@ export interface operations {
                 length?: number | null;
                 /** @description Signer UUID */
                 signer_uuid?: string | null;
+                /** @description The list of fileIds (database file IDs). It's the ids of LibreSign files */
+                "fileIds[]"?: number[] | null;
                 /** @description The list of nodeIds (also called fileIds). It's the ids of files at Nextcloud */
-                "nodeIds[]"?: string[] | null;
+                "nodeIds[]"?: number[] | null;
                 /** @description Status could be none or many of 0 = draft, 1 = able to sign, 2 = partial signed, 3 = signed, 4 = deleted. */
                 "status[]"?: number[] | null;
                 /** @description Start date of signature request (UNIX timestamp) */
@@ -3320,6 +3339,96 @@ export interface operations {
             };
         };
     };
+    "file-get-thumbnail-by-file-id": {
+        parameters: {
+            query?: {
+                /** @description Width of generated file */
+                x?: number;
+                /** @description Height of generated file */
+                y?: number;
+                /** @description Crop, boolean value, default false */
+                a?: 0 | 1;
+                /** @description Force to generate a new thumbnail */
+                forceIcon?: 0 | 1;
+                /** @description To force a given mimetype for the file */
+                mode?: string;
+                /** @description If we have no preview enabled, we can redirect to the mime icon if any */
+                mimeFallback?: 0 | 1;
+            };
+            header: {
+                /** @description Required to be true for the API request to pass */
+                "OCS-APIRequest": boolean;
+            };
+            path: {
+                apiVersion: "v1";
+                /** @description The LibreSign fileId (database id) */
+                fileId: number;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description OK */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "*/*": string;
+                };
+            };
+            /** @description Redirect */
+            303: {
+                headers: {
+                    Location?: string;
+                    [name: string]: unknown;
+                };
+                content?: never;
+            };
+            /** @description Bad request */
+            400: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description Forbidden */
+            403: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            404: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+        };
+    };
     "file-save": {
         parameters: {
             query?: never;
diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts
index 5f4b5202a0..1a45399646 100644
--- a/src/types/openapi/openapi.ts
+++ b/src/types/openapi/openapi.ts
@@ -604,6 +604,23 @@ export type paths = {
         patch?: never;
         trace?: never;
     };
+    "/ocs/v2.php/apps/libresign/api/{apiVersion}/file/thumbnail/file_id/{fileId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Return the thumbnail of a LibreSign file by fileId */
+        get: operations["file-get-thumbnail-by-file-id"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/ocs/v2.php/apps/libresign/api/{apiVersion}/file": {
         parameters: {
             query?: never;
@@ -2706,8 +2723,10 @@ export interface operations {
                 length?: number | null;
                 /** @description Signer UUID */
                 signer_uuid?: string | null;
+                /** @description The list of fileIds (database file IDs). It's the ids of LibreSign files */
+                "fileIds[]"?: number[] | null;
                 /** @description The list of nodeIds (also called fileIds). It's the ids of files at Nextcloud */
-                "nodeIds[]"?: string[] | null;
+                "nodeIds[]"?: number[] | null;
                 /** @description Status could be none or many of 0 = draft, 1 = able to sign, 2 = partial signed, 3 = signed, 4 = deleted. */
                 "status[]"?: number[] | null;
                 /** @description Start date of signature request (UNIX timestamp) */
@@ -2842,6 +2861,96 @@ export interface operations {
             };
         };
     };
+    "file-get-thumbnail-by-file-id": {
+        parameters: {
+            query?: {
+                /** @description Width of generated file */
+                x?: number;
+                /** @description Height of generated file */
+                y?: number;
+                /** @description Crop, boolean value, default false */
+                a?: 0 | 1;
+                /** @description Force to generate a new thumbnail */
+                forceIcon?: 0 | 1;
+                /** @description To force a given mimetype for the file */
+                mode?: string;
+                /** @description If we have no preview enabled, we can redirect to the mime icon if any */
+                mimeFallback?: 0 | 1;
+            };
+            header: {
+                /** @description Required to be true for the API request to pass */
+                "OCS-APIRequest": boolean;
+            };
+            path: {
+                apiVersion: "v1";
+                /** @description The LibreSign fileId (database id) */
+                fileId: number;
+            };
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description OK */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "*/*": string;
+                };
+            };
+            /** @description Redirect */
+            303: {
+                headers: {
+                    Location?: string;
+                    [name: string]: unknown;
+                };
+                content?: never;
+            };
+            /** @description Bad request */
+            400: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description Forbidden */
+            403: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            404: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": {
+                        ocs: {
+                            meta: components["schemas"]["OCSMeta"];
+                            data: unknown;
+                        };
+                    };
+                };
+            };
+        };
+    };
     "file-save": {
         parameters: {
             query?: never;
diff --git a/src/views/FilesList/FileEntry/FileEntryActions.vue b/src/views/FilesList/FileEntry/FileEntryActions.vue
index cfeb433cf6..eb89efd7a0 100644
--- a/src/views/FilesList/FileEntry/FileEntryActions.vue
+++ b/src/views/FilesList/FileEntry/FileEntryActions.vue
@@ -131,17 +131,17 @@ export default {
 	computed: {
 		openedMenu: {
 			get() {
-				return this.actionsMenuStore.opened === this.source.nodeId
+				return this.actionsMenuStore.opened === this.source.id
 			},
 			set(opened) {
-				this.actionsMenuStore.opened = opened ? this.source.nodeId : null
+				this.actionsMenuStore.opened = opened ? this.source.id : null
 			},
 		},
 		visibleMenu() {
 			return this.enabledMenuActions.filter(action => this.visibleIf(action))
 		},
 		file() {
-			return this.filesStore.files[this.source.nodeId]
+			return this.filesStore.files[this.source.id]
 		},
 		boundariesElement() {
 			return document.querySelector('.app-content > .files-list')
@@ -208,14 +208,15 @@ export default {
 					signer_uuid: signUuid,
 					force_fetch: true,
 				})
-				this.signStore.setFileToSign(files[this.source.nodeId])
+				this.signStore.setFileToSign(files[this.source.id])
 				this.$router.push({
 					name: 'SignPDF',
 					params: {
 						uuid: signUuid,
 					},
 				})
-				this.filesStore.selectFile(this.source.nodeId)
+				this.filesStore.selectFile(this.source.id)
+				this.sidebarStore.activeRequestSignatureTab()
 			} else if (action.id === 'validate') {
 				this.$router.push({
 					name: 'ValidationFile',
diff --git a/src/views/FilesList/FileEntry/FileEntryMixin.js b/src/views/FilesList/FileEntry/FileEntryMixin.js
index 9d44461b48..94f7efd2dc 100644
--- a/src/views/FilesList/FileEntry/FileEntryMixin.js
+++ b/src/views/FilesList/FileEntry/FileEntryMixin.js
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { useSidebarStore } from '../../../store/sidebar.js'
+
 export default {
 	props: {
 		source: {
@@ -21,10 +23,10 @@ export default {
 
 		openedMenu: {
 			get() {
-				return this.actionsMenuStore.opened === this.source.nodeId
+				return this.actionsMenuStore.opened === this.source.id
 			},
 			set(opened) {
-				this.actionsMenuStore.opened = opened ? this.source.nodeId : null
+				this.actionsMenuStore.opened = opened ? this.source.id : null
 			},
 		},
 
@@ -61,7 +63,7 @@ export default {
 				return
 			}
 
-			this.actionsMenuStore.opened = this.source.nodeId
+			this.actionsMenuStore.opened = this.source.id
 
 			// Prevent any browser defaults
 			event.preventDefault()
@@ -78,7 +80,9 @@ export default {
 		openDetailsIfAvailable(event) {
 			event.preventDefault()
 			event.stopPropagation()
-			this.filesStore.selectFile(this.source.nodeId)
+			this.filesStore.selectFile(this.source.id)
+			const sidebarStore = useSidebarStore()
+			sidebarStore.activeRequestSignatureTab()
 		},
 	},
 }
diff --git a/src/views/FilesList/FileEntry/FileEntryPreview.vue b/src/views/FilesList/FileEntry/FileEntryPreview.vue
index 766c697e6b..fa44fe9e65 100644
--- a/src/views/FilesList/FileEntry/FileEntryPreview.vue
+++ b/src/views/FilesList/FileEntry/FileEntryPreview.vue
@@ -70,10 +70,14 @@ export default {
 			}
 
 			let previewUrl = ''
-			if (this.source?.uuid?.length > 0) {
+			if (this.source?.nodeId) {
 				previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/{nodeId}', {
 					nodeId: this.source.nodeId,
 				})
+			} else if (this.source?.id) {
+				previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/file_id/{fileId}', {
+					fileId: this.source.id,
+				})
 			} else {
 				previewUrl = window.location.origin + generateUrl('/core/preview?fileId={fileid}', {
 					fileid: this.source.nodeId,
diff --git a/src/views/FilesList/FilesListTableHeaderActions.vue b/src/views/FilesList/FilesListTableHeaderActions.vue
index 6f3841a69e..c5d8b63db3 100644
--- a/src/views/FilesList/FilesListTableHeaderActions.vue
+++ b/src/views/FilesList/FilesListTableHeaderActions.vue
@@ -176,8 +176,10 @@ export default {
 			}
 		},
 		changeLoadingStatusOfSelectedFiles(status) {
-			this.selectionStore.selected.forEach(nodeId => {
-				this.filesStore.files[nodeId].loading = status
+			this.selectionStore.selected.forEach(key => {
+				if (this.filesStore.files[key]) {
+					this.filesStore.files[key].loading = status
+				}
 			})
 		},
 	},
diff --git a/src/views/Request.vue b/src/views/Request.vue
index 98176c47ff..9aab083414 100644
--- a/src/views/Request.vue
+++ b/src/views/Request.vue
@@ -12,7 +12,7 @@
 				</p>
 			</header>
 			<div class="content-request">
-				<File v-show="filesStore.selectedNodeId > 0"
+				<File v-show="filesStore.selectedFileId > 0"
 					status="0"
 					status-text="none" />
 				<ReqestPicker v-if="!sidebarStore.isVisible()"
diff --git a/src/views/SignPDF/SignPDF.vue b/src/views/SignPDF/SignPDF.vue
index 0d6234487c..7bca3c5fdc 100644
--- a/src/views/SignPDF/SignPDF.vue
+++ b/src/views/SignPDF/SignPDF.vue
@@ -58,11 +58,11 @@ export default {
 	},
 	setup() {
 		const signStore = useSignStore()
-		const fileStore = useFilesStore()
+		const filesStore = useFilesStore()
 		const sidebarStore = useSidebarStore()
 		const signMethodsStore = useSignMethodsStore()
 		const isMobile = window.innerWidth <= 512
-		return { signStore, fileStore, sidebarStore, signMethodsStore, isMobile }
+		return { signStore, filesStore, sidebarStore, signMethodsStore, isMobile }
 	},
 	data() {
 		return {
@@ -111,14 +111,14 @@ export default {
 			}
 		},
 		async initSignInternal() {
-			const files = await this.fileStore.getAllFiles({
+			const files = await this.filesStore.getAllFiles({
 				signer_uuid: this.$route.params.uuid,
 			})
-			for (const nodeId in files) {
-				const signer = files[nodeId].signers.find(row => row.me) || {}
+			for (const key in files) {
+				const signer = files[key].signers.find(row => row.me) || {}
 				if (Object.keys(signer).length > 0) {
-					this.signStore.setFileToSign(files[nodeId])
-					this.fileStore.selectedNodeId = parseInt(nodeId)
+					this.signStore.setFileToSign(files[key])
+					this.filesStore.selectedFileId = parseInt(key)
 					return
 				}
 			}
@@ -128,7 +128,7 @@ export default {
 				generateOcsUrl('/apps/libresign/api/v1/file/validate/uuid/{uuid}', { uuid: this.$route.params.uuid })
 			)
 			this.signStore.setFileToSign(response.data.ocs.data)
-			this.fileStore.selectedNodeId = response.data.ocs.data.nodeId
+			this.filesStore.selectedFileId = response.data.ocs.data.id
 		},
 		async handleInitialStatePdfs(urls) {
 			if (!Array.isArray(urls) || urls.length === 0) {