diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index dc0866f74a..b5da49ed5e 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -82,9 +82,10 @@ bool Launcher::AdvancedPage::loadSettings()
     loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
     loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
     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");
-    loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
 
     // Input Settings
     loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
@@ -145,9 +146,14 @@ 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");
-    saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
 
     // Input Settings
     saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");
@@ -190,3 +196,9 @@ void Launcher::AdvancedPage::slotLoadedCellsChanged(QStringList cellNames)
 {
     loadCellsForAutocomplete(cellNames);
 }
+
+void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
+{
+    weaponSheathingCheckBox->setEnabled(checked);
+    shieldSheathingCheckBox->setEnabled(checked);
+}
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 59de3d319b..3f5e5bfa7a 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -29,6 +29,7 @@ namespace Launcher
     private slots:
         void on_skipMenuCheckBox_stateChanged(int state);
         void on_runScriptAfterStartupBrowseButton_clicked();
+        void slotAnimSourcesToggled(bool checked);
 
     private:
         Files::ConfigurationManager &mCfgMgr;
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index b22b2d9ea9..79a9e9f5dc 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -169,26 +169,6 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="weaponSheathingCheckBox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Weapon sheathing</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="shieldSheathingCheckBox">
-            <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="animSourcesCheckBox">
             <property name="toolTip">
@@ -199,6 +179,53 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QWidget" name="sheathingGroup" native="true">
+            <layout class="QVBoxLayout" name="sheathingLayout">
+             <property name="spacing">
+              <number>6</number>
+             </property>
+             <property name="leftMargin">
+              <number>20</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <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">
+                <bool>false</bool>
+               </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Render holstered weapons (with quivers and scabbards), requires modded assets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>Weapon sheathing</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>