diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 7fd6c7b392..5b0255a0a5 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -216,6 +216,26 @@ public function signFPath(string $uuid): TemplateResponse {
 		return $this->index();
 	}
 
+	/**
+	 * Sign page to authenticated signer
+	 *
+	 * The path is used only by frontend
+	 *
+	 * @param string $uuid Sign request uuid
+	 * @return TemplateResponse<Http::STATUS_OK, array{}>
+	 *
+	 * 200: OK
+	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[RequireSetupOk]
+	#[PublicPage]
+	#[RequireSignRequestUuid]
+	#[FrontpageRoute(verb: 'GET', url: '/p/sign/{uuid}/pdf')]
+	public function signPdf(string $uuid): TemplateResponse {
+		return $this->sign($uuid);
+	}
+
 	/**
 	 * Sign page to authenticated signer
 	 *
diff --git a/src/Components/RightSidebar/RequestSignatureTab.vue b/src/Components/RightSidebar/RequestSignatureTab.vue
index 6dc882140a..4f7641c6e4 100644
--- a/src/Components/RightSidebar/RequestSignatureTab.vue
+++ b/src/Components/RightSidebar/RequestSignatureTab.vue
@@ -56,7 +56,9 @@
 			</NcButton>
 		</div>
 		<VisibleElements />
-		<NcModal v-if="modalSrc" size="full" @close="closeModal()">
+		<NcModal v-if="modalSrc"
+			size="full"
+			:can-close="false">
 			<iframe :src="modalSrc" class="iframe" />
 		</NcModal>
 	</div>
@@ -157,16 +159,20 @@ export default {
 		},
 	},
 	async mounted() {
+		window.addEventListener('message', this.closeModal)
 		subscribe('libresign:edit-signer', this.editSigner)
 		this.filesStore.disableIdentifySigner()
 	},
 	beforeUnmount() {
+		window.removeEventListener('message', this.closeModal)
 		unsubscribe('libresign:edit-signer')
 	},
 	methods: {
-		closeModal() {
-			this.modalSrc = ''
-			this.filesStore.flushSelectedFile()
+		closeModal(message) {
+			if (message.data.type === 'close-modal') {
+				this.modalSrc = ''
+				this.filesStore.flushSelectedFile()
+			}
 		},
 		validationFile() {
 			if (this.useModal) {
diff --git a/src/views/SignPDF/_partials/Sign.vue b/src/views/SignPDF/_partials/Sign.vue
index e9f6e38c62..7da0462e94 100644
--- a/src/views/SignPDF/_partials/Sign.vue
+++ b/src/views/SignPDF/_partials/Sign.vue
@@ -4,17 +4,16 @@
 			<Signatures v-if="hasSignatures" />
 		</div>
 		<div v-if="!loading" class="button-wrapper">
-			<div v-if="ableToSign" class="button-wrapper">
-				<NcButton :wide="true"
-					:disabled="loading"
-					type="primary"
-					@click="confirmSignDocument">
-					<template #icon>
-						<NcLoadingIcon v-if="loading" :size="20" />
-					</template>
-					{{ t('libresign', 'Sign the document.') }}
-				</NcButton>
-			</div>
+			<NcButton v-if="ableToSign"
+				:wide="true"
+				:disabled="loading"
+				type="primary"
+				@click="confirmSignDocument">
+				<template #icon>
+					<NcLoadingIcon v-if="loading" :size="20" />
+				</template>
+				{{ t('libresign', 'Sign the document.') }}
+			</NcButton>
 			<div v-else-if="signMethodsStore.needCreatePassword()">
 				<p>
 					{{ t('libresign', 'Please define your sign password') }}
@@ -42,6 +41,13 @@
 					{{ t('libresign', 'Unable to sign.') }}
 				</p>
 			</div>
+			<NcButton v-if="isModal"
+				:wide="true"
+				:disabled="loading"
+				type="secondary"
+				@click="closeModal">
+				{{ t('libresign', 'Cancel') }}
+			</NcButton>
 		</div>
 		<NcDialog v-if="signMethodsStore.modal.clickToSign"
 			:can-close="!loading"
@@ -150,6 +156,7 @@ export default {
 			},
 			signPassword: '',
 			showManagePassword: false,
+			isModal: window.self !== window.top,
 		}
 	},
 	computed: {
@@ -213,6 +220,11 @@ export default {
 				}
 			}
 		},
+		closeModal() {
+			window.parent?.postMessage({
+				type: 'close-modal',
+			}, '*')
+		},
 		toggleManagePassword() {
 			this.showManagePassword = !this.showManagePassword
 		},
@@ -318,6 +330,9 @@ export default {
 
 .button-wrapper {
 	padding: calc(var(--default-grid-baseline, 4px)*2);
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
 }
 
 .sign-elements {