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 66918ad71..7e9716e5b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -118,7 +118,7 @@
                      </add-async-upload-downloader>
                    </li>
                    <li v-if="canEditDocument(d)">
-                     <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
+                      <a class="btn btn-wopilink" @click="submitBeforeEdit(d.storedObject)"></a>
                    </li>
                    <li v-if="d.workflows.length === 0">
                      <a class="btn btn-delete" @click="removeDocument(d)">
@@ -359,10 +359,19 @@ export default {
          })
          ;
       },
-      buildEditLink(storedObject) {
-         return `/chill/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
+      buildEditLink(document) {
+         return `/chill/wopi/edit/${document.storedObject.uuid}?returnPath=` + encodeURIComponent(
             window.location.pathname + window.location.search + window.location.hash);
       },
+      submitBeforeEdit(storedObject) {
+         const callback = (data) => {
+            let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+            let document = evaluation.documents.find(d => d.storedObject.id === storedObject.id);
+            //console.log('=> document', document);
+            window.location.assign(this.buildEditLink(document));
+         };
+         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+      },
       submitBeforeGenerate({template}) {
          const callback = (data) => {
             let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;