diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py
index 9fc11f936..60c0b12a2 100644
--- a/picard/ui/options/renaming.py
+++ b/picard/ui/options/renaming.py
@@ -153,8 +153,6 @@ class RenamingOptionsPage(OptionsPage):
             self.ui.windows_compatible_filenames.setChecked(self.config.setting["windows_compatible_filenames"])
         self.ui.rename_files.setChecked(self.config.setting["rename_files"])
         self.ui.move_files.setChecked(self.config.setting["move_files"])
-        self.ui.move_files_to.setEnabled(self.config.setting["move_files"])
-        self.ui.move_files_to_browse.setEnabled(self.config.setting["move_files"])
         self.ui.use_va_format.setChecked(self.config.setting["use_va_format"])
         self.ui.ascii_filenames.setChecked(self.config.setting["ascii_filenames"])
         self.ui.file_naming_format.setPlainText(self.config.setting["file_naming_format"])
diff --git a/picard/ui/ui_options_renaming.py b/picard/ui/ui_options_renaming.py
index 0341c9797..a22dee597 100644
--- a/picard/ui/ui_options_renaming.py
+++ b/picard/ui/ui_options_renaming.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/options_renaming.ui'
 #
-# Created: Sun Jan 22 12:13:48 2012
+# Created: Wed Feb  1 19:25:34 2012
 #      by: PyQt4 UI code generator 4.9
 #
 # WARNING! All changes made in this file will be lost!
@@ -39,6 +39,7 @@ class Ui_RenamingOptionsPage(object):
         self.move_files.setObjectName(_fromUtf8("move_files"))
         self.gridLayout.addWidget(self.move_files, 2, 0, 1, 1)
         self.delete_empty_dirs = QtGui.QCheckBox(RenamingOptionsPage)
+        self.delete_empty_dirs.setEnabled(False)
         self.delete_empty_dirs.setObjectName(_fromUtf8("delete_empty_dirs"))
         self.gridLayout.addWidget(self.delete_empty_dirs, 2, 1, 1, 1)
         self.windows_compatible_filenames = QtGui.QCheckBox(RenamingOptionsPage)
@@ -52,24 +53,27 @@ class Ui_RenamingOptionsPage(object):
         self.horizontalLayout_4 = QtGui.QHBoxLayout()
         self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
         self.move_files_to = QtGui.QLineEdit(RenamingOptionsPage)
-        self.move_files_to.setEnabled(True)
+        self.move_files_to.setEnabled(False)
         self.move_files_to.setObjectName(_fromUtf8("move_files_to"))
         self.horizontalLayout_4.addWidget(self.move_files_to)
         self.move_files_to_browse = QtGui.QPushButton(RenamingOptionsPage)
-        self.move_files_to_browse.setEnabled(True)
+        self.move_files_to_browse.setEnabled(False)
         self.move_files_to_browse.setObjectName(_fromUtf8("move_files_to_browse"))
         self.horizontalLayout_4.addWidget(self.move_files_to_browse)
         self.verticalLayout_5.addLayout(self.horizontalLayout_4)
         self.horizontalLayout_5 = QtGui.QHBoxLayout()
         self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
         self.move_additional_files = QtGui.QCheckBox(RenamingOptionsPage)
+        self.move_additional_files.setEnabled(False)
         self.move_additional_files.setObjectName(_fromUtf8("move_additional_files"))
         self.horizontalLayout_5.addWidget(self.move_additional_files)
         self.move_additional_files_pattern = QtGui.QLineEdit(RenamingOptionsPage)
+        self.move_additional_files_pattern.setEnabled(False)
         self.move_additional_files_pattern.setObjectName(_fromUtf8("move_additional_files_pattern"))
         self.horizontalLayout_5.addWidget(self.move_additional_files_pattern)
         self.verticalLayout_5.addLayout(self.horizontalLayout_5)
         self.file_format_tabs = QtGui.QTabWidget(RenamingOptionsPage)
+        self.file_format_tabs.setEnabled(True)
         self.file_format_tabs.setObjectName(_fromUtf8("file_format_tabs"))
         self.tab = QtGui.QWidget()
         self.tab.setObjectName(_fromUtf8("tab"))
@@ -179,7 +183,7 @@ class Ui_RenamingOptionsPage(object):
         self.verticalLayout_5.addWidget(self.file_format_tabs)
 
         self.retranslateUi(RenamingOptionsPage)
-        self.file_format_tabs.setCurrentIndex(1)
+        self.file_format_tabs.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(RenamingOptionsPage)
 
     def retranslateUi(self, RenamingOptionsPage):
diff --git a/ui/options_renaming.ui b/ui/options_renaming.ui
index a4a69329f..e568412ce 100644
--- a/ui/options_renaming.ui
+++ b/ui/options_renaming.ui
@@ -48,6 +48,9 @@
      </item>
      <item row="2" column="1">
       <widget class="QCheckBox" name="delete_empty_dirs">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="text">
         <string>Delete empty directories</string>
        </property>
@@ -77,14 +80,14 @@
      <item>
       <widget class="QLineEdit" name="move_files_to">
        <property name="enabled">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="move_files_to_browse">
        <property name="enabled">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
        <property name="text">
         <string>Browse...</string>
@@ -97,20 +100,30 @@
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
       <widget class="QCheckBox" name="move_additional_files">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="text">
         <string>Move additional files:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="move_additional_files_pattern"/>
+      <widget class="QLineEdit" name="move_additional_files_pattern">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTabWidget" name="file_format_tabs">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">