diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig
index f25c06030..abab2436d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig
@@ -1,7 +1,3 @@
-
-{# Twig way
-    TODO: une route, un template avec un header CHILL et un iframe
-#}
 <a href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
     class="btn btn-wopilink">
     {{ 'online_edit_document'|trans }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 8fbc3fa5c..3963b0715 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -53,6 +53,11 @@
                     <li>
                         <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
                     </li>
+                    {% if chill_document_is_editable(document.object) %}
+                        <li>
+                            {{ document.object|chill_document_edit_button }}
+                        </li>
+                    {% endif %}
                 {% endif %}
                 {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
@@ -75,6 +80,11 @@
                     <li>
                         <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
                     </li>
+                    {% if chill_document_is_editable(document.object) %}
+                        <li>
+                            {{ document.object|chill_document_edit_button }}
+                        </li>
+                    {% endif %}
                 {% endif %}
                 {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
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 ca0d16eec..b1e657554 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -345,7 +345,7 @@ export default {
       ISOToDatetime,
       canEditDocument(document) {
          return 'storedObject' in document ?
-            this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false;
+            this.mime.includes(document.storedObject.type) : false;
       },
       listAllStatus() {
          console.log('load all status');