diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js
index d2f736a..e73d91e 100644
--- a/pagure/static/issue_ev.js
+++ b/pagure/static/issue_ev.js
@@ -148,9 +148,9 @@ add_comment = function(data) {
 update_comment = function(data) {
   console.log('Updating comment ' + data.comment_id);
   var field = $('#comment-' + data.comment_id);
-  field.find('.issue_action').html(
-    '<span title="' + data.comment_date + '">Edited by ' + data.comment_editor + ' seconds ago</span>'
-    + '<a class="reply" title="Reply to this comment - loose formating"> reply </a>');
+  field.find('.edit_date').html(
+    '<span title="' + data.comment_date + '">Edited by '
+    + data.comment_editor + ' seconds ago</span>');
   var sec = field.parent();
   sec.find('.comment_body').html(data.comment_updated);
 }
diff --git a/pagure/static/request_ev.js b/pagure/static/request_ev.js
index ca60e54..fb42770 100644
--- a/pagure/static/request_ev.js
+++ b/pagure/static/request_ev.js
@@ -45,15 +45,16 @@ add_comment = function(data) {
 update_comment = function(data) {
   console.log('Updating comment ' + data.comment_id);
   var field = $('#comment-' + data.comment_id);
-  field.find('.issue_action').html(
-    '<span title="' + data.comment_date + '">Edited by ' + data.comment_editor + ' seconds ago</span>'
-    + '<a class="reply" title="Reply to this comment - loose formating"> reply </a>');
+  field.find('.edit_date').html(
+    '<span title="' + data.comment_date + '">Edited by '
+    + data.comment_editor + ' seconds ago</span>');
   var sec = field.parent();
   if (sec.find('.comment_body').length) {
     sec.find('.comment_body').html(data.comment_updated);
   } else {
     sec.parent().parent().find('.comment_date').html(
-        ' Updated by ' + data.comment_editor + ' seconds ago');
+        '<span title="' + data.comment_date + '">Edited by '
+        + data.comment_editor + ' seconds ago</span>');
     sec.parent().parent().find('.pr_comment').html(data.comment_updated);
   }
 }
diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 334ebc1..74d9118 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -75,11 +75,13 @@
         href="#comment-{{ id }}">¶</a>
       <aside class="issue_action icon">
 
+        <span class="edit_date" title="{{
+            comment.edited_on.strftime('%Y-%m-%d %H:%M:%S') if comment.edited_on
+        }}">
         {% if comment.edited_on %}
-            <span title="{{
-            comment.updated_info
-            }}">Edited by {{ comment.editor.username }} {{ comment.edited_on | humanize }}</span>
+            Edited by {{ comment.editor.username }} {{ comment.edited_on | humanize }}
         {% endif %}
+        </span>
 
         <a class="reply" title="Reply to this comment - loose formating">
           reply