diff --git a/.changes/unreleased/Fixed-20230619-205836.yaml b/.changes/unreleased/Fixed-20230619-205836.yaml
new file mode 100644
index 000000000..54b292394
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230619-205836.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: '[notification on document evaluation] fix entityId and return path when
+  adding a notification on a document in an evaluation'
+time: 2023-06-19T20:58:36.941795323+02:00
+custom:
+  Issue: "114"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
new file mode 100644
index 000000000..ce0671d82
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
@@ -0,0 +1,20 @@
+const buildLinkCreate = function (relatedEntityClass: string, relatedEntityId: number, to: number | null, returnPath: string | null): string
+{
+    const params = new URLSearchParams();
+    params.append('entityClass', relatedEntityClass);
+    params.append('entityId', relatedEntityId.toString());
+
+    if (null !== to) {
+        params.append('tos[0]', to.toString());
+    }
+
+    if (null !== returnPath) {
+        params.append('returnPath', returnPath);
+    }
+
+    return `/fr/notification/create?${params.toString()}`;
+}
+
+export {
+    buildLinkCreate,
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index a4e03bd31..4ea00f73a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -201,6 +201,7 @@ import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload
 import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
+import {buildLinkCreate as buildLinkCreateNotification} from 'ChillMainAssets/lib/entity-notification/api';
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 const i18n = {
@@ -413,14 +414,16 @@ export default {
          return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
-       goToGenerateDocumentNotification(document, tos){
+       goToGenerateDocumentNotification(document, tos) {
           const callback = (data) => {
              let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
-             if (tos === true) {
-                window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument&entityId=${document.id}&tos[0]=${this.$store.state.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/work/${evaluation.id}/edit`)
-             } else {
-                window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument&entityId=${document.id}&returnPath=/fr/person/accompanying-period/work/${evaluation.id}/edit`)
-             }
+             let updatedDocument = evaluation.documents.find(d => d.key === document.key);
+             window.location.assign(buildLinkCreateNotification(
+                 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                 updatedDocument.id,
+                 tos === true ? this.$store.state.work.accompanyingPeriod.user.id : null,
+                 window.location.pathname + window.location.search + window.location.hash
+             ));
           };
            return this.$store.dispatch('submit', callback)
                .catch(e => {console.log(e); throw e});