diff --git a/progit/app.py b/progit/app.py
index 3363c53..d63943b 100644
--- a/progit/app.py
+++ b/progit/app.py
@@ -391,6 +391,7 @@ def view_issues(repo, username=None, status=None):
         select='issues',
         repo=repo,
         username=username,
+        status=status,
         issues=issues,
     )
 
diff --git a/progit/templates/issues.html b/progit/templates/issues.html
index 9209238..ff9a6d5 100644
--- a/progit/templates/issues.html
+++ b/progit/templates/issues.html
@@ -8,31 +8,28 @@
 
 <div class="inline">
   <h2>
-    {% if issues %}
-    {% if issues[0].status != 'Open' %}
+    {% if status and status != 'Open' %}
     Closed
-    {% endif %}{% endif %}
+    {% endif %}
     Issues
   </h2>
-  {% if issues %}
-    {% if issues[0].status == 'Open' %}
+    {% if status and status != 'Open' %}
         {% if '/fork/' in request.url %}
           <a href="{{ url_for('view_fork_issues', username=username,
-                     repo=repo.name) }}?status=Closed">
+                     repo=repo.name) }}">
         {% else %}
-          <a href="{{ url_for('view_issues', repo=repo.name) }}?status=Closed">
+          <a href="{{ url_for('view_issues', repo=repo.name) }}">
         {% endif %}
-        (Closed)</a>
+        (Open)</a>
     {% else %}
         {% if '/fork/' in request.url %}
           <a href="{{ url_for('view_fork_issues', username=username,
-                     repo=repo.name) }}">
+                     repo=repo.name) }}?status=Closed">
         {% else %}
-          <a href="{{ url_for('view_issues', repo=repo.name) }}">
+          <a href="{{ url_for('view_issues', repo=repo.name) }}?status=Closed">
         {% endif %}
-        (Open)</a>
+        (Closed)</a>
     {% endif %}
-  {% endif %}
 </div>
 
 <span class="create_issue">