diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index ee4c844..3f948db 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -165,7 +165,6 @@
                 </a>
               {% endif %}
             </td>
-            {% if not status or status|lower == 'open' %}
             <td class="nowrap">
                 <a href="{{ url_for('view_issues', username=username,
                     repo=repo.name, author=issue.user.user,
@@ -175,21 +174,23 @@
                     {{ issue.user.user }}
                 </a>
             </td>
-            {% endif %}
             <td class="nowrap">
+            {% if not status or status|lower == 'open' %}
               {% if issue.assignee %}
-              <a href="{{ url_for('view_issues', username=username,
-                repo=repo.name, assignee=issue.assignee.username,
-                tags=tags, author=author, status=status) }}"
-                title="Filter issues by assignee">
-                {{ issue.assignee.default_email | avatar(16) | safe }}
-                {{ issue.assignee.user }}
-              </a>
+                <a href="{{ url_for('view_issues', username=username,
+                  repo=repo.name, assignee=issue.assignee.username,
+                  tags=tags, author=author, status=status) }}"
+                  title="Filter issues by assignee">
+                  {{ issue.assignee.default_email | avatar(16) | safe }}
+                  {{ issue.assignee.user }}
+                </a>
               {% else %}
-              <a class="text-muted" href="{{ url_for('view_issues', username=username,
-                repo=repo.name, tags=tags, author=author, status=status,
-                assignee=0) }}">unassigned</a>
+                <a class="text-muted" href="{{ url_for('view_issues', username=username,
+                  repo=repo.name, tags=tags, author=author, status=status,
+                  assignee=0) }}">unassigned
+                </a>
               {% endif %}
+            {% endif %}
             </td>
         </tr>
     {% else %}