diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index fa058eb303..37f024c08d 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -552,16 +552,18 @@ class BrowseServer(object):
                 ids = self.search_cache('search:"%s"'%which)
             except:
                 raise cherrypy.HTTPError(404, 'Search: %r not understood'%which)
-        elif category == 'newest':
-            ids = self.search_cache('')
+        all_ids = self.search_cache('')
+        if category == 'newest':
+            ids = all_ids
             hide_sort = 'true'
         elif category == 'allbooks':
-            ids = self.search_cache('')
+            ids = all_ids
         else:
             q = category
             if q == 'news':
                 q = 'tags'
             ids = self.db.get_books_for_category(q, cid)
+            ids = [x for x in ids if x in all_ids]
 
         items = [self.db.data._data[x] for x in ids]
         if category == 'newest':