diff --git a/MiraAPI/Patches/Options/GameSettingMenuPatches.cs b/MiraAPI/Patches/Options/GameSettingMenuPatches.cs
index d18407d..647ad5d 100644
--- a/MiraAPI/Patches/Options/GameSettingMenuPatches.cs
+++ b/MiraAPI/Patches/Options/GameSettingMenuPatches.cs
@@ -397,6 +397,21 @@ internal static class GameSettingMenuPatches
 
     private static void CleanupTab(GameOptionsMenu settings, RolesSettingsMenu roles)
     {
+        if (roles.roleChances != null)
+        {
+            CleanupRoleSettings(roles);
+        }
+
+        if (settings.Children != null)
+        {
+            CleanupSettings(settings);
+        }
+
+        if (_modifiersTab?.Children?.Count > 0)
+        {
+            CleanupSettings(_modifiersTab);
+        }
+
         void CleanupRoleSettings(RolesSettingsMenu rolesMenu)
         {
             if (rolesMenu.advancedSettingChildren != null)
@@ -452,20 +467,5 @@ internal static class GameSettingMenuPatches
                 gameOptMenu.scrollBar.ScrollToTop();
             }
         }
-
-        if (roles.roleChances != null && SelectedMod?.CustomRoles.Count > 0)
-        {
-            CleanupRoleSettings(roles);
-        }
-
-        if (settings.Children != null && SelectedMod?.OptionGroups.Count > 0)
-        {
-            CleanupSettings(settings);
-        }
-
-        if (_modifiersTab?.Children?.Count > 0)
-        {
-            CleanupSettings(_modifiersTab);
-        }
     }
 }