diff --git a/picard/ui/ui_options_renaming.py b/picard/ui/ui_options_renaming.py
index a3c2b5852..041f943e6 100644
--- a/picard/ui/ui_options_renaming.py
+++ b/picard/ui/ui_options_renaming.py
@@ -3,8 +3,10 @@
 # Automatically generated - don't edit.
 # Use `python setup.py build_ui` to update it.
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_RenamingOptionsPage(object):
     def setupUi(self, RenamingOptionsPage):
         RenamingOptionsPage.setObjectName("RenamingOptionsPage")
@@ -52,24 +54,16 @@ class Ui_RenamingOptionsPage(object):
         self.delete_empty_dirs.setObjectName("delete_empty_dirs")
         self.verticalLayout_4.addWidget(self.delete_empty_dirs)
         self.verticalLayout_5.addWidget(self.move_files)
-        self.rename_files = QtWidgets.QGroupBox(RenamingOptionsPage)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rename_files.sizePolicy().hasHeightForWidth())
-        self.rename_files.setSizePolicy(sizePolicy)
-        self.rename_files.setCheckable(True)
-        self.rename_files.setChecked(False)
+        self.rename_files = QtWidgets.QCheckBox(RenamingOptionsPage)
         self.rename_files.setObjectName("rename_files")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.rename_files)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.ascii_filenames = QtWidgets.QCheckBox(self.rename_files)
+        self.verticalLayout_5.addWidget(self.rename_files)
+        self.ascii_filenames = QtWidgets.QCheckBox(RenamingOptionsPage)
         self.ascii_filenames.setObjectName("ascii_filenames")
-        self.verticalLayout_3.addWidget(self.ascii_filenames)
-        self.windows_compatibility = QtWidgets.QCheckBox(self.rename_files)
+        self.verticalLayout_5.addWidget(self.ascii_filenames)
+        self.windows_compatibility = QtWidgets.QCheckBox(RenamingOptionsPage)
         self.windows_compatibility.setObjectName("windows_compatibility")
-        self.verticalLayout_3.addWidget(self.windows_compatibility)
-        self.file_naming_format_group = QtWidgets.QGroupBox(self.rename_files)
+        self.verticalLayout_5.addWidget(self.windows_compatibility)
+        self.file_naming_format_group = QtWidgets.QGroupBox(RenamingOptionsPage)
         self.file_naming_format_group.setObjectName("file_naming_format_group")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.file_naming_format_group)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
@@ -110,15 +104,14 @@ class Ui_RenamingOptionsPage(object):
         self.file_naming_format_default.setObjectName("file_naming_format_default")
         self.horizontalLayout.addWidget(self.file_naming_format_default)
         self.verticalLayout_2.addLayout(self.horizontalLayout)
-        self.verticalLayout_3.addWidget(self.file_naming_format_group)
-        self.file_naming_format_documentation = QtWidgets.QLabel(self.rename_files)
+        self.verticalLayout_5.addWidget(self.file_naming_format_group)
+        self.file_naming_format_documentation = QtWidgets.QLabel(RenamingOptionsPage)
         self.file_naming_format_documentation.setText("")
         self.file_naming_format_documentation.setTextFormat(QtCore.Qt.RichText)
         self.file_naming_format_documentation.setWordWrap(True)
         self.file_naming_format_documentation.setOpenExternalLinks(True)
         self.file_naming_format_documentation.setObjectName("file_naming_format_documentation")
-        self.verticalLayout_3.addWidget(self.file_naming_format_documentation)
-        self.verticalLayout_5.addWidget(self.rename_files)
+        self.verticalLayout_5.addWidget(self.file_naming_format_documentation)
         self.groupBox = QtWidgets.QGroupBox(RenamingOptionsPage)
         self.groupBox.setObjectName("groupBox")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
@@ -149,10 +142,7 @@ class Ui_RenamingOptionsPage(object):
         RenamingOptionsPage.setTabOrder(self.move_files_to_browse, self.move_additional_files)
         RenamingOptionsPage.setTabOrder(self.move_additional_files, self.move_additional_files_pattern)
         RenamingOptionsPage.setTabOrder(self.move_additional_files_pattern, self.delete_empty_dirs)
-        RenamingOptionsPage.setTabOrder(self.delete_empty_dirs, self.rename_files)
-        RenamingOptionsPage.setTabOrder(self.rename_files, self.ascii_filenames)
-        RenamingOptionsPage.setTabOrder(self.ascii_filenames, self.windows_compatibility)
-        RenamingOptionsPage.setTabOrder(self.windows_compatibility, self.file_naming_format)
+        RenamingOptionsPage.setTabOrder(self.delete_empty_dirs, self.file_naming_format)
         RenamingOptionsPage.setTabOrder(self.file_naming_format, self.file_naming_format_default)
 
     def retranslateUi(self, RenamingOptionsPage):
@@ -162,7 +152,7 @@ class Ui_RenamingOptionsPage(object):
         self.move_files_to_browse.setText(_("Browse..."))
         self.move_additional_files.setText(_("Move additional files (case insensitive):"))
         self.delete_empty_dirs.setText(_("Delete empty directories"))
-        self.rename_files.setTitle(_("Rename files when saving"))
+        self.rename_files.setText(_("Rename files when saving"))
         self.ascii_filenames.setText(_("Replace non-ASCII characters"))
         self.windows_compatibility.setText(_("Windows compatibility"))
         self.file_naming_format_group.setTitle(_("Name files like this"))
@@ -173,4 +163,3 @@ class Ui_RenamingOptionsPage(object):
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
         self.file_naming_format_default.setText(_("Default"))
         self.groupBox.setTitle(_("Examples"))
-
diff --git a/ui/options_renaming.ui b/ui/options_renaming.ui
index bfb11b7c0..1afef9e4c 100644
--- a/ui/options_renaming.ui
+++ b/ui/options_renaming.ui
@@ -19,7 +19,7 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,0,0,0,0,0,0">
    <item>
     <widget class="QGroupBox" name="move_files">
      <property name="title">
@@ -97,150 +97,136 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="rename_files">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
+    <widget class="QCheckBox" name="rename_files">
+     <property name="text">
       <string>Rename files when saving</string>
      </property>
-     <property name="checkable">
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="ascii_filenames">
+     <property name="text">
+      <string>Replace non-ASCII characters</string>
      </property>
-     <property name="checked">
-      <bool>false</bool>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="windows_compatibility">
+     <property name="text">
+      <string>Windows compatibility</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="file_naming_format_group">
+     <property name="title">
+      <string>Name files like this</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="ascii_filenames">
-        <property name="text">
-         <string>Replace non-ASCII characters</string>
+       <widget class="QTextEdit" name="file_naming_format">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="windows_compatibility">
-        <property name="text">
-         <string>Windows compatibility</string>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="file_naming_format_group">
-        <property name="title">
-         <string>Name files like this</string>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QTextEdit" name="file_naming_format">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="font">
-            <font>
-             <family>Monospace</family>
-            </font>
-           </property>
-           <property name="cursor" stdset="0">
-            <cursorShape>IBeamCursor</cursorShape>
-           </property>
-           <property name="tabChangesFocus">
-            <bool>false</bool>
-           </property>
-           <property name="lineWrapMode">
-            <enum>QTextEdit::NoWrap</enum>
-           </property>
-           <property name="html">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+         </font>
+        </property>
+        <property name="cursor" stdset="0">
+         <cursorShape>IBeamCursor</cursorShape>
+        </property>
+        <property name="tabChangesFocus">
+         <bool>false</bool>
+        </property>
+        <property name="lineWrapMode">
+         <enum>QTextEdit::NoWrap</enum>
+        </property>
+        <property name="html">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Monospace'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="tabStopWidth">
-            <number>20</number>
-           </property>
-           <property name="acceptRichText">
-            <bool>false</bool>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::TextEditorInteraction</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="renaming_error">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="file_naming_format_default">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Default</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
+        </property>
+        <property name="tabStopWidth">
+         <number>20</number>
+        </property>
+        <property name="acceptRichText">
+         <bool>false</bool>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::TextEditorInteraction</set>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="file_naming_format_documentation">
-        <property name="text">
-         <string/>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>2</number>
         </property>
-        <property name="textFormat">
-         <enum>Qt::RichText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
+        <item>
+         <widget class="QLabel" name="renaming_error">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="file_naming_format_default">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Default</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="file_naming_format_documentation">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -300,9 +286,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>move_additional_files</tabstop>
   <tabstop>move_additional_files_pattern</tabstop>
   <tabstop>delete_empty_dirs</tabstop>
-  <tabstop>rename_files</tabstop>
-  <tabstop>ascii_filenames</tabstop>
-  <tabstop>windows_compatibility</tabstop>
   <tabstop>file_naming_format</tabstop>
   <tabstop>file_naming_format_default</tabstop>
  </tabstops>