diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 53c4771e38..aae3067ba0 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -217,7 +217,14 @@ class BrowseServer(object):
             scn += 'list'
             fm = self.db.field_metadata
             sort_opts, added = [], set([])
+            displayed_custom_fields = custom_fields_to_display(self.db)
             for x in fm.sortable_field_keys():
+                if x == 'ondevice':
+                    continue
+                if fm[x]['is_custom'] and x not in displayed_custom_fields:
+                    continue
+                if x == 'comments' or fm[x]['datatype'] == 'comments':
+                    continue
                 n = fm[x]['name']
                 if n not in added:
                     added.add(n)
@@ -294,7 +301,7 @@ class BrowseServer(object):
 
         displayed_custom_fields = custom_fields_to_display(self.db)
         for category in sorted(categories,
-                            cmp=lambda x,y: cmp(getter(x), getter(y))):
+                    cmp=lambda x,y: cmp(getter(x), getter(y))):
             if len(categories[category]) == 0:
                 continue
             if category == 'formats':