diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 774f6e0..8c5a6e7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -139,23 +139,27 @@
       <div class="issue_action icon pull-xs-right p-b-1">
         <div class="btn-group" role="group" aria-label="Basic example">
           {% if id != 0 and g.fas_user and comment.parent.status in [True, 'Open'] %}
-            <a class="reply btn btn-secondary btn-sm" data-toggle="tooltip" title="Reply to this comment - loose formating">
+            <a class="reply btn btn-secondary btn-sm" data-toggle="tooltip"
+                title="Reply to this comment - loose formating">
               <span class="oi" data-glyph="share-boxed"></span>
             </a>
           {% endif %}
-          {% if id != 0 and g.fas_user and (
-              comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %}
+          {% if id != 0 and g.fas_user and repo_admin or (
+              comment.parent.status in [True, 'Open']
+              and g.fas_user.username == comment.user.username) %}
           <a class="btn btn-secondary btn-sm edit_btn" href="{{
-            '%s/comment/%s/edit' % (request.base_url, comment.id) }}"
-            data-comment="{{ comment.id }}" data-objid="{{ issueid }}">
+              '%s/comment/%s/edit' % (request.base_url, comment.id) }}"
+              data-comment="{{ comment.id }}" data-objid="{{ issueid }}">
             <span class="oi" data-glyph="pencil"></span>
           </a>
           {% endif %}
-          {% if id != 0 and g.fas_user and (
-              comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %}
-          <button class="btn btn-secondary btn-sm" type="submit" name="drop_comment" value="{{ comment.id }}"
-            onclick="return confirm('Do you really want to remove this comment?');"
-            title="Remove comment">
+          {% if id != 0 and g.fas_user and repo_admin or (
+              comment.parent.status in [True, 'Open']
+              and g.fas_user.username == comment.user.username) %}
+          <button class="btn btn-secondary btn-sm" type="submit"
+              name="drop_comment" value="{{ comment.id }}"
+              onclick="return confirm('Do you really want to remove this comment?');"
+              title="Remove comment">
             <span class="oi" data-glyph="trash"></span>
           </button>
           {% endif %}