diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 16799e0..07cc8d0 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -163,7 +163,7 @@
 </div>
 {% endif %}
 
-<ul class="nav nav-tabs nav-small" role="tablist">
+<ul class="nav nav-tabs nav-small" role="tablist" id="pr-tabs">
   <li class="nav-item"><a class="nav-link active" data-toggle="tab" role="tab" href="#comments">Comments</a></li>
   <li class="nav-item">
     <a class="nav-link" data-toggle="tab" role="tab" href="#request_diff">
@@ -313,10 +313,19 @@
           repo=repo.name, requestid=requestid) }}" method="post"
           onsubmit="return try_async_comment(this, null)">
 
-      {% for comment in pull_request.discussion %}
+      {% for comment in pull_request.comments %}
         {% if not comment.commit_id %}
           {{ show_comment(comment, comment.id, repo, username,
                           requestid, form, repo_admin) }}
+        {% else %}
+          <div class="card">
+            <div class="card-header">
+              <div>
+                {{comment.user.user}} commented on line <a href="#c-{{comment.commit_id}}-{{comment.line}}" onclick="showTab()">{{comment.line}} of {{comment.filename}}</a>
+                <div class="pull-xs-right text-muted"><span title="{{comment.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{ comment.date_created | humanize}}</span></div>
+              </div>
+            </div>
+          </div>
         {% endif %}
       {% endfor %}
       {{ mergeform.csrf_token }}
@@ -578,6 +587,12 @@ function setup_reply_btns() {
   );
 };
 
+
+  function showTab(){
+   $('#pr-tabs a[href="#request_diff"]').tab('show')
+  }
+
+
  $(document).ready(function() {
 
   $( ".commit_msg_txt" ).hide();
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 056756c..dd9bf0e 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -85,7 +85,7 @@ def format_loc(loc, commit=None, filename=None, prequest=None, index=None):
             break
         if filename and commit:
             output.append(
-                '<tr><td class="cell1">'
+                '<tr id="c-%(commit)s-%(cnt_lbl)s"><td class="cell1">'
                 '<a id="%(cnt)s" href="#%(cnt)s" data-line-number="%(cnt_lbl)s"></a></td>'
                 '<td class="prc" data-row="%(cnt_lbl)s"'
                 ' data-filename="%(filename)s" data-commit="%(commit)s">'