diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index b5da49ed5e..6f2811e665 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -84,8 +84,11 @@ bool Launcher::AdvancedPage::loadSettings()
     loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
     connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
     loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
-    loadSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
-    loadSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
+    if (animSourcesCheckBox->checkState())
+    {
+        loadSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
+        loadSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
+    }
 
     // Input Settings
     loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
@@ -146,11 +149,6 @@ void Launcher::AdvancedPage::saveSettings()
     saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
     saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
     saveSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
-    if (animSourcesCheckBox->checkState())
-    {
-        saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
-        saveSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
-    }
     saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
     saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
     saveSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game");
@@ -201,4 +199,9 @@ void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
 {
     weaponSheathingCheckBox->setEnabled(checked);
     shieldSheathingCheckBox->setEnabled(checked);
+    if (!checked)
+    {
+        weaponSheathingCheckBox->setCheckState(Qt::Unchecked);
+        shieldSheathingCheckBox->setCheckState(Qt::Unchecked);
+    }
 }
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 79a9e9f5dc..8748a6d0b0 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -197,19 +197,6 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item>
-              <widget class="QCheckBox" name="shieldSheathingCheckBox">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
-               <property name="text">
-                <string>Shield sheathing</string>
-               </property>
-              </widget>
-             </item>
              <item>
               <widget class="QCheckBox" name="weaponSheathingCheckBox">
                <property name="enabled">
@@ -223,6 +210,19 @@
                </property>
               </widget>
              </item>
+             <item>
+              <widget class="QCheckBox" name="shieldSheathingCheckBox">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered shield, requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>Shield sheathing</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>