diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 94c6c0b55..a0d88d1bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -251,6 +251,7 @@
           relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
           :relatedEntityId="this.work.id"
           :workflowsAvailables="this.work.workflows_availables"
+          :preventDefaultMoveToGenerate="true"
           @go-to-generate-workflow="goToGenerateWorkflow"
        ></list-workflow-modal>
     </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 0e73f138c..770966d8b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -114,6 +114,12 @@
                         {% set suppEvaluations = suppEvaluations|merge([
                             {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation', 'relatedEntityId': e.id }
                         ]) %}
+
+                        {% for d in e.documents %}
+                            {% set suppEvaluations = suppEvaluations|merge([
+                                {'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id }
+                            ]) %}
+                        {% endfor %}
                     {% endfor %}
                     <li>
                         {{ chill_entity_workflow_list(