diff --git a/archivebox/core/views.py b/archivebox/core/views.py
index aaef74e2..a81d98f3 100644
--- a/archivebox/core/views.py
+++ b/archivebox/core/views.py
@@ -94,6 +94,7 @@ class PublicArchiveView(ListView):
     template = 'snapshot_list.html'
     model = Snapshot
     paginate_by = 100
+    ordering = ['title']
 
     def get_context_data(self, **kwargs):
         return {
@@ -106,7 +107,7 @@ class PublicArchiveView(ListView):
         qs = super().get_queryset(**kwargs) 
         query = self.request.GET.get('q')
         if query:
-            qs = Snapshot.objects.filter(title__icontains=query)
+            qs = qs.filter(title__icontains=query)
         for snapshot in qs:
             snapshot.icons = snapshot_icons(snapshot)
         return qs