diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 8c62304f09..df6ac45e5b 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -54,7 +54,7 @@ gprefs.defaults['toolbar_text'] = 'auto'
 gprefs.defaults['show_child_bar'] = False
 gprefs.defaults['font'] = None
 gprefs.defaults['tags_browser_partition_method'] = 'first letter'
-gprefs.defaults['tags_browser_collapse_at'] = 50
+gprefs.defaults['tags_browser_collapse_at'] = 100
 
 # }}}
 
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 36a45b8dce..3b6bbb63ab 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>670</width>
-    <height>420</height>
+    <height>392</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -141,35 +141,63 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Tags browser: partitioning method:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_tags_browser_partition_method</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="QComboBox" name="opt_tags_browser_partition_method"/>
-   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Tags browser - collapse when more items than:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_tags_browser_collapse_at</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QSpinBox" name="opt_tags_browser_collapse_at">
-     <property name="maximum">
-      <number>1000000</number>
-     </property>
-    </widget>
+   <item row="7" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Tags browser category partitioning method:</string>
+       </property>
+       <property name="buddy">
+        <cstring>opt_tags_browser_partition_method</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="opt_tags_browser_partition_method">
+       <property name="toolTip">
+        <string>Choose how tag browser subcategories are displayed when
+there are more items than the limit. Select by first
+letter to see an A, B, C list. Choose partitioned to
+have a list of fixed-sized groups. Set to disabled
+if you never want subcategories</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Collapse when more items than:</string>
+       </property>
+       <property name="buddy">
+        <cstring>opt_tags_browser_collapse_at</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="opt_tags_browser_collapse_at">
+       <property name="toolTip">
+        <string>If a Tag Browser category has more than this number of items, it is divided up into sub-categories. Set to zero to disable.</string>
+       </property>
+       <property name="maximum">
+        <number>10000</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
    <item row="15" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_2">