diff --git a/common/src/main/java/io/wispforest/accessories/mixin/client/AbstractContainerScreenMixin.java b/common/src/main/java/io/wispforest/accessories/mixin/client/AbstractContainerScreenMixin.java
index 00ebd5523..b4f2410fc 100644
--- a/common/src/main/java/io/wispforest/accessories/mixin/client/AbstractContainerScreenMixin.java
+++ b/common/src/main/java/io/wispforest/accessories/mixin/client/AbstractContainerScreenMixin.java
@@ -55,9 +55,4 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt
 
         original.call(instance, function, texture, x, y, width, height);
     }
-
-    @WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;matches(II)Z"))
-    private boolean accessories$adjustCloseCheck(KeyMapping instance, int keysym, int scancode, Operation<Boolean> original) {
-        return original.call(instance, keysym, scancode) || original.call(AccessoriesClient.OPEN_SCREEN, keysym, scancode);
-    }
 }
\ No newline at end of file
diff --git a/fabric/src/main/java/io/wispforest/accessories/fabric/mixin/client/AbstractContainerScreenMixin.java b/fabric/src/main/java/io/wispforest/accessories/fabric/mixin/client/AbstractContainerScreenMixin.java
index a90a499af..a995ddab2 100644
--- a/fabric/src/main/java/io/wispforest/accessories/fabric/mixin/client/AbstractContainerScreenMixin.java
+++ b/fabric/src/main/java/io/wispforest/accessories/fabric/mixin/client/AbstractContainerScreenMixin.java
@@ -3,7 +3,9 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import io.wispforest.accessories.client.AccessoriesClient;
 import io.wispforest.accessories.pond.ContainerScreenExtension;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.inventory.Slot;
@@ -30,4 +32,9 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt
 
         if (override == null || override) original.call(instance, guiGraphics);
     }
+
+    @WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;matches(II)Z", ordinal = 0))
+    private boolean accessories$adjustCloseCheck(KeyMapping instance, int keysym, int scancode, Operation<Boolean> original) {
+        return original.call(instance, keysym, scancode) || original.call(AccessoriesClient.OPEN_SCREEN, keysym, scancode);
+    }
 }
\ No newline at end of file
diff --git a/neoforge/src/main/java/io/wispforest/accessories/neoforge/mixin/client/AbstractContainerScreenMixin.java b/neoforge/src/main/java/io/wispforest/accessories/neoforge/mixin/client/AbstractContainerScreenMixin.java
index 5cc732ab9..b069e0edb 100644
--- a/neoforge/src/main/java/io/wispforest/accessories/neoforge/mixin/client/AbstractContainerScreenMixin.java
+++ b/neoforge/src/main/java/io/wispforest/accessories/neoforge/mixin/client/AbstractContainerScreenMixin.java
@@ -3,7 +3,10 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.blaze3d.platform.InputConstants;
+import io.wispforest.accessories.client.AccessoriesClient;
 import io.wispforest.accessories.pond.ContainerScreenExtension;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.inventory.Slot;
@@ -32,4 +35,9 @@ public abstract class AbstractContainerScreenMixin implements ContainerScreenExt
 
         if (override == null || override) original.call(instance, guiGraphics);
     }
+
+    @WrapOperation(method = "keyPressed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyMapping;isActiveAndMatches(Lcom/mojang/blaze3d/platform/InputConstants$Key;)Z", ordinal = 0))
+    private boolean accessories$adjustCloseCheck(KeyMapping instance, InputConstants.Key mouseKey, Operation<Boolean> original) {
+        return original.call(instance, mouseKey) || original.call(AccessoriesClient.OPEN_SCREEN, mouseKey);
+    }
 }
\ No newline at end of file