diff --git a/gradle.properties b/gradle.properties
index 276d627..513709e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,11 +11,11 @@ archives_base_name = soundcontroller
 ## Fabric: https://fabricmc.net/develop
 ## ModMenu: https://maven.terraformersmc.com/com/terraformersmc/modmenu
 
-modmenu_version=18.0.0-alpha.8
+modmenu_version=20.0.0-alpha.1
 
-minecraft_version=26.1
-loader_version=0.18.4
-loom_version=1.14-SNAPSHOT
+minecraft_version=26.2-rc-2
+loader_version=0.19.3
+loom_version=1.17-SNAPSHOT
 
 # Fabric API
-fabric_version=0.146.1+26.1.2
\ No newline at end of file
+fabric_version=0.152.1+26.2
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c61a118..1a70468 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java
index c3d107f..db22ea0 100644
--- a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java
+++ b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java
@@ -35,6 +35,7 @@ private void replaceDoneButton(Operation<Void> original) {
 
 		//noinspection ConstantValue
 		if (!((Object)this instanceof SoundOptionsScreen)) {
+            original.call();
             return;
         }
 
@@ -52,7 +53,7 @@ private void replaceDoneButton(Operation<Void> original) {
     @Unique
     private void soundcontroller$addLayoutButton(Minecraft client, LinearLayout layout, Component text, Screen nextScreen) {
         layout.addChild(Button.builder(text, button -> {
-            client.setScreen(nextScreen);
+            client.setScreenAndShow(nextScreen);
         }).build());
     }
 }
\ No newline at end of file