diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index ed5b31596..6fb1545ba 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -16,6 +16,7 @@ Moderator: Animateur
 
 #CRUD event
 Details of an event: Détails d'un événement
+Back to details of an event: Retour aux détails d'un événement
 New event: Nouvel événement
 Back to the most recent events: Retour aux derniers événements
 'Back to %person% events': Retour aux événements de %person%
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index 451c52e4e..a2b0cc130 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -42,13 +42,22 @@
             <li class="cancel">
                 <a href="{{ returnPath }}" class="sc-button bt-cancel">{{ returnLabel }}</a>
             </li>
+            <li>
+                <a href="{{ path('chill_event__event_edit', {
+                    'event_id': event.id,
+                    'return_path': app.request.getRequestUri,
+                    'return_label': 'Back to details of an event'|trans
+                    }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}
+                </a>
+            </li>
+        {% else %}
+            <li>
+                <a href="{{ path('chill_event__event_edit', {'event_id': event.id }) }}" class="sc-button bt-edit">
+                    {{ 'Edit'|trans }}
+                </a>
+            </li>
         {% endif %}
 
-        <li>
-            <a href="{{ path('chill_event__event_edit', { 'event_id': event.id }) }}" class="sc-button bt-edit">
-                {{ 'Edit'|trans }}
-            </a>
-        </li>
     </ul>
             
     <h2>{{ 'Participations'|trans }}</h2>