diff --git a/src/main/java/dev/isxander/controlify/compatibility/screen/ScreenProcessor.java b/src/main/java/dev/isxander/controlify/compatibility/screen/ScreenProcessor.java
index 532b4a7..44752b2 100644
--- a/src/main/java/dev/isxander/controlify/compatibility/screen/ScreenProcessor.java
+++ b/src/main/java/dev/isxander/controlify/compatibility/screen/ScreenProcessor.java
@@ -79,12 +79,9 @@ public class ScreenProcessor {
             if (processor.overrideControllerButtons(this, controller)) return;
         }
 
-        var buttons = controller.state().buttons();
-        var prevButtons = controller.prevState().buttons();
-
-        if (buttons.a() && !prevButtons.a())
+        if (controller.bindings().GUI_PRESS.justPressed())
             screen.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0);
-        if (buttons.b() && !prevButtons.b())
+        if (controller.bindings().GUI_BACK.justPressed())
             screen.onClose();
     }
 
diff --git a/src/main/java/dev/isxander/controlify/compatibility/screen/component/SliderComponentProcessor.java b/src/main/java/dev/isxander/controlify/compatibility/screen/component/SliderComponentProcessor.java
index fa96ee3..b37e1fc 100644
--- a/src/main/java/dev/isxander/controlify/compatibility/screen/component/SliderComponentProcessor.java
+++ b/src/main/java/dev/isxander/controlify/compatibility/screen/component/SliderComponentProcessor.java
@@ -2,7 +2,6 @@ package dev.isxander.controlify.compatibility.screen.component;
 
 import dev.isxander.controlify.compatibility.screen.ScreenProcessor;
 import dev.isxander.controlify.controller.Controller;
-import dev.isxander.controlify.controller.ControllerState;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import org.lwjgl.glfw.GLFW;
 
@@ -53,9 +52,7 @@ public class SliderComponentProcessor extends ComponentProcessor<AbstractSliderB
     public boolean overrideControllerButtons(ScreenProcessor screen, Controller controller) {
         if (!this.canChangeValueGetter.get()) return false;
 
-        var buttons = controller.state().buttons();
-        var prevButtons = controller.prevState().buttons();
-        if (buttons.b() && !prevButtons.b()) {
+        if (controller.bindings().GUI_BACK.justPressed()) {
             this.canChangeValueSetter.accept(false);
             return true;
         }