diff --git a/media/commitfest/js/commitfest.js b/media/commitfest/js/commitfest.js
index 27a54f94..2d6b0b8f 100644
--- a/media/commitfest/js/commitfest.js
+++ b/media/commitfest/js/commitfest.js
@@ -257,7 +257,10 @@ function flagCommitted(committer) {
 }
 
 function sortpatches(sortby) {
-    if ($("#id_sortkey").val() === sortby) {
+    const sortkey = $("#id_sortkey").val();
+    if (sortkey === sortby) {
+        $("#id_sortkey").val(-sortby);
+    } else if (-sortkey === sortby) {
         $("#id_sortkey").val(0);
     } else {
         $("#id_sortkey").val(sortby);
diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html
index aee8af9f..ac5b17de 100644
--- a/pgcommitfest/commitfest/templates/commitfest.html
+++ b/pgcommitfest/commitfest/templates/commitfest.html
@@ -60,18 +60,18 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
 <table class="table table-striped table-bordered table-hover table-condensed">
  <thead>
   <tr>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(5);">Patch</a>{%if sortkey == 5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(4);">ID</a>{%if sortkey == 4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(5);">Patch</a>{%if sortkey == 5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(4);">ID</a>{%if sortkey == 4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
    <th>Status</th>
    <th>Ver</th>
    <th>CI status</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(6);">Stats</a>{%if sortkey == 6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(6);">Stats</a>{%if sortkey == 6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -6%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
    <th>Author</th>
    <th>Reviewers</th>
    <th>Committer</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(3);">Num cfs</a>{%if sortkey == 3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(1);">Latest activity</a>{%if sortkey == 1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
-   <th><a href="#" style="color:#333333;" onclick="return sortpatches(2);">Latest mail</a>{%if sortkey == 2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(3);">Num cfs</a>{%if sortkey == 3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -3%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(1);">Latest activity</a>{%if sortkey == 1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -1%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+   <th><a href="#" style="color:#333333;" onclick="return sortpatches(2);">Latest mail</a>{%if sortkey == 2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -2%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
 {%if user.is_staff%}
    <th>Select</th>
 {%endif%}
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 1f0df87d..152d39b5 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -241,18 +241,30 @@ def commitfest(request, cfid):
 
         if sortkey == 1:
             orderby_str = "modified, created"
+        elif sortkey == -1:
+            orderby_str = "modified DESC, created DESC"
         elif sortkey == 2:
             orderby_str = "lastmail, created"
+        elif sortkey == -2:
+            orderby_str = "lastmail DESC, created DESC"
         elif sortkey == 3:
             orderby_str = "num_cfs DESC, modified, created"
+        elif sortkey == -3:
+            orderby_str = "num_cfs ASC, modified DESC, created DESC"
         elif sortkey == 4:
             orderby_str = "p.id"
+        elif sortkey == -4:
+            orderby_str = "p.id DESC"
         elif sortkey == 5:
             orderby_str = "p.name, created"
+        elif sortkey == -5:
+            orderby_str = "p.name DESC, created DESC"
         elif sortkey == 6:
             orderby_str = (
                 "branch.all_additions + branch.all_deletions NULLS LAST, created"
             )
+        elif sortkey == -6:
+            orderby_str = "branch.all_additions + branch.all_deletions DESC NULLS LAST, created DESC"
         else:
             orderby_str = "p.id"
             sortkey = 0