diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig
index 514ca388d..2238b152b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig
@@ -7,12 +7,12 @@
             {% if options.pinned is defined %}
                 <i class="fa fa-flag fa-fw" title="{{ 'pinned'|trans }}"></i>
             {% endif %}
-            <a id="comment{{ comment.id }}" href="#comment{{ comment.id }}" class="fa fa-pencil-square-o fa-fw"></a>
+            <a id="comment{{ comment.id }}" href="{{ '#comment' ~ comment.id }}" class="fa fa-pencil-square-o fa-fw"></a>
             {{ 'by'|trans }}<b>{{ comment.creator }}</b>{{ ', '  ~ 'on'|trans ~ ' ' ~ comment.createdAt|format_date('long') }}<br>
             <i>{{ 'Last updated on'|trans ~ ' ' ~ comment.updatedAt|format_datetime('long', 'short') }}</i>
         </div>
         <ul class="record_actions">
-            <li><a class="btn btn-edit" title="{{ 'Edit'|trans }}" href=""></a></li>
+            <li><a class="btn btn-edit" title="{{ 'Edit'|trans }}" href="{{ '?edit=' ~ comment.id ~ '#comment' ~ comment.id }}"></a></li>
             <li><a class="btn btn-delete" title="{{ 'Delete'|trans }}" href=""></a></li>
         </ul>
     </div>