diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index a122f539c6..be8b55e648 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -267,6 +267,7 @@ class BrowseServer(object):
         def getter(x):
             return category_meta[x]['name'].lower()
 
+        displayed_custom_fields = custom_fields_to_display(self.db)
         for category in sorted(categories,
                             cmp=lambda x,y: cmp(getter(x), getter(y))):
             if len(categories[category]) == 0:
@@ -276,6 +277,8 @@ class BrowseServer(object):
             meta = category_meta.get(category, None)
             if meta is None:
                 continue
+            if meta['is_custom'] and category not in displayed_custom_fields:
+                continue
             cats.append((meta['name'], category))
         cats = ['<li title="{2} {0}">{0}<span>/browse/category/{1}</span></li>'\
                 .format(xml(x, True), xml(quote(y)), xml(_('Browse books by')))