diff --git a/app/api/serializer.py b/app/api/serializer.py
index 91849a46..47fad9b2 100644
--- a/app/api/serializer.py
+++ b/app/api/serializer.py
@@ -245,6 +245,10 @@ def get_alias_infos_with_pagination_v3(
         q = q.filter(Alias.enabled)
     elif alias_filter == "disabled":
         q = q.filter(Alias.enabled.is_(False))
+    elif alias_filter == "pinned":
+        q = q.filter(Alias.pinned)
+    elif alias_filter == "hibp":
+        q = q.filter(Alias.hibp_breaches.any())
 
     q = q.order_by(Alias.pinned.desc())
 
@@ -256,8 +260,6 @@ def get_alias_infos_with_pagination_v3(
         q = q.order_by(Alias.email)
     elif sort == "z2a":
         q = q.order_by(Alias.email.desc())
-    elif alias_filter == "hibp":
-        q = q.filter(Alias.hibp_breaches.any())
     else:
         # default sorting
         q = q.order_by(latest_activity.desc())
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index ae8f98e2..2035f550 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -177,6 +177,9 @@
             <option value="" {% if filter == "" %} selected {% endif %}>
               All Aliases
             </option>
+            <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
+              Pinned Aliases
+            </option>
             <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
               Only Enabled Aliases
             </option>