diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 50b7897..ea8e4a7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -306,10 +306,10 @@
 
 
 {% macro show_initial_comment(comment, username, repo, issueid, form) %}
-<div class="clearfix p-b-3">
+<div class="clearfix p-b-3" id="original_comment_box">
   <section class="issue_comment" id="comment-0">
     <div class="comment_body">
-{{ comment.content | markdown | noJS | safe }}
+{{- comment.content | markdown | noJS | safe -}}
     </div>
   </section>
   <div class="issue_action icon float-right">
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index c71ab80..ce5db3a 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -769,6 +769,9 @@ function setup_reply_btns() {
   $( ".reply" ).click(
     function() {
       var _section = $(this).closest('.card');
+      if (!_section.length) {
+        var _section = $(this).closest('#original_comment_box');
+      }
       var _comment = _section.find('.comment_body');
       var _text = _comment.text().split("\n");
       var _output = new Array();