diff --git a/src/calibre/gui2/dialogs/tag_categories.ui b/src/calibre/gui2/dialogs/tag_categories.ui
index e06a0503c7..b49475afed 100644
--- a/src/calibre/gui2/dialogs/tag_categories.ui
+++ b/src/calibre/gui2/dialogs/tag_categories.ui
@@ -17,10 +17,10 @@
    <iconset resource="../../../../resources/images.qrc">
     <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
   </property>
-  <layout class="QGridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <layout class="QHBoxLayout">
-     <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
       <widget class="QLabel" name="label_3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -45,7 +45,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="1">
       <widget class="QComboBox" name="category_box">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -67,70 +67,7 @@
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="0" column="1">
-    <widget class="QToolButton" name="delete_category_button">
-     <property name="toolTip">
-      <string>Delete this selected tag category</string>
-     </property>
-     <property name="text">
-      <string>...</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../../../resources/images.qrc">
-       <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLineEdit" name="input_box">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>60</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Enter a category name, then use the add button or the rename button</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="add_category_button">
-       <property name="toolTip">
-        <string>Add a new category</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="3">
-    <widget class="QToolButton" name="rename_category_button">
-     <property name="toolTip">
-      <string>Rename the current category to what is in the box</string>
-     </property>
-     <property name="text">
-      <string>...</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../../../../resources/images.qrc">
-       <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <item>
+     <item row="1" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>&amp;Category filter: </string>
@@ -143,7 +80,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="1">
       <widget class="QComboBox" name="category_filter_box">
        <property name="toolTip">
         <string>Select the content kind of the new category</string>
@@ -152,19 +89,82 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="1" colspan="2">
-    <widget class="QCheckBox" name="apply_vl_checkbox">
-     <property name="toolTip">
-      <string>&lt;p&gt;Show items in the Available items box only if they appear in the
+   <item row="0" column="1" colspan="3">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QToolButton" name="delete_category_button">
+       <property name="toolTip">
+        <string>Delete this selected tag category</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../resources/images.qrc">
+         <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout">
+       <item>
+        <widget class="QLineEdit" name="input_box">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>60</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Enter a category name, then use the add button or the rename button</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="add_category_button">
+         <property name="toolTip">
+          <string>Add a new category</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="2">
+      <widget class="QToolButton" name="rename_category_button">
+       <property name="toolTip">
+        <string>Rename the current category to what is in the box</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../resources/images.qrc">
+         <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" colspan="3">
+      <widget class="QCheckBox" name="apply_vl_checkbox">
+       <property name="toolTip">
+        <string>&lt;p&gt;Show items in the Available items box only if they appear in the
       current virtual library. Applied items not in the VL will be marked
       &quot;not on any book&quot;.&lt;/p&gt;</string>
-     </property>
-     <property name="text">
-      <string>&amp;Show only available items in current virtual library</string>
-     </property>
-    </widget>
+       </property>
+       <property name="text">
+        <string>&amp;Show only available items in current virtual library</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <layout class="QVBoxLayout">
      <item>
       <layout class="QHBoxLayout">
@@ -212,7 +212,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="1">
+   <item row="1" column="1">
     <layout class="QVBoxLayout">
      <item>
       <spacer>
@@ -256,7 +256,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="2">
+   <item row="1" column="2">
     <layout class="QVBoxLayout">
      <item>
       <layout class="QHBoxLayout">
@@ -297,7 +297,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="3">
+   <item row="1" column="3">
     <layout class="QVBoxLayout">
      <item>
       <spacer>
@@ -341,7 +341,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="4">
+   <item row="2" column="0" colspan="4">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>