diff --git a/patches/minecraft/net/minecraft/client/GameSettings.java.patch b/patches/minecraft/net/minecraft/client/GameSettings.java.patch
index c47a8a5f9e..20f28711e8 100644
--- a/patches/minecraft/net/minecraft/client/GameSettings.java.patch
+++ b/patches/minecraft/net/minecraft/client/GameSettings.java.patch
@@ -38,11 +38,8 @@
           }
  
           for(SoundCategory soundcategory : SoundCategory.values()) {
-@@ -712,6 +718,25 @@
-          }
-       }
+@@ -714,4 +720,22 @@
  
-+      if (net.minecraftforge.fml.client.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
        p_198017_1_.func_198985_a(set);
     }
 +
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 68bd9e533f..30a8ca8842 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -24,7 +24,7 @@
        Util.field_211180_a = RenderSystem.initBackendSystem();
        this.field_195557_T = new VirtualScreen(this);
        this.field_195558_d = this.field_195557_T.func_217626_a(screensize, this.field_71474_y.field_198019_u, this.func_230149_ax_());
-@@ -383,7 +384,6 @@
+@@ -383,13 +384,13 @@
  
        this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
        this.field_71417_B = new MouseHelper(this);
@@ -32,14 +32,13 @@
        this.field_195559_v = new KeyboardListener(this);
        this.field_195559_v.func_197968_a(this.field_195558_d.func_198092_i());
        RenderSystem.initRenderer(this.field_71474_y.field_209231_W, false);
-@@ -391,6 +391,7 @@
+       this.field_147124_at = new Framebuffer(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), true, field_142025_a);
        this.field_147124_at.func_147604_a(0.0F, 0.0F, 0.0F, 0.0F);
        this.field_110451_am = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES, this.field_152352_aC);
-       this.field_71474_y.func_198017_a(this.field_110448_aq);
 +      net.minecraftforge.fml.client.ClientModLoader.begin(this, this.field_110448_aq, this.field_110451_am, this.field_195554_ax);
+       this.field_71474_y.func_198017_a(this.field_110448_aq);
        this.field_110448_aq.func_198983_a();
        this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
-       this.field_110451_am.func_219534_a(this.field_135017_as);
 @@ -434,12 +435,14 @@
           this.func_193986_ar();
           this.field_110451_am.func_219534_a(this.field_193995_ae);
diff --git a/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java b/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
index 4bc5180351..142b926e61 100644
--- a/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
+++ b/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
@@ -211,7 +211,7 @@ public class ClientModLoader
             }
         }
         final T packInfo = ResourcePackInfo.createResourcePack("mod_resources", true, () -> new DelegatingResourcePack("mod_resources", "Mod Resources",
-                new PackMetadataSection(new TranslationTextComponent("fml.resources.modresources", hiddenPacks.size()), 4),
+                new PackMetadataSection(new TranslationTextComponent("fml.resources.modresources", hiddenPacks.size()), 5),
                 hiddenPacks), factory, ResourcePackInfo.Priority.BOTTOM);
         packList.put("mod_resources", packInfo);
     }