diff --git a/src/main/java/de/mari_023/fabric/ae2wtlib/util/WirelessCraftConfirmScreen.java b/src/main/java/de/mari_023/fabric/ae2wtlib/util/WirelessCraftConfirmScreen.java
index 28301a53..dd30f531 100644
--- a/src/main/java/de/mari_023/fabric/ae2wtlib/util/WirelessCraftConfirmScreen.java
+++ b/src/main/java/de/mari_023/fabric/ae2wtlib/util/WirelessCraftConfirmScreen.java
@@ -13,6 +13,7 @@
 import appeng.util.Platform;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
@@ -381,7 +382,7 @@ private IAEItemStack findVisualStack(final IAEItemStack l) {
 
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
-        if(!checkHotbarKeys(keyCode, scanCode)) {
+        if(!checkHotbarKeys(InputUtil.fromKeyCode(keyCode, scanCode))) {
             if(keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
                 start();
                 return true;
diff --git a/src/main/java/de/mari_023/fabric/ae2wtlib/wit/WITScreen.java b/src/main/java/de/mari_023/fabric/ae2wtlib/wit/WITScreen.java
index e4bf1ba6..c6419b46 100644
--- a/src/main/java/de/mari_023/fabric/ae2wtlib/wit/WITScreen.java
+++ b/src/main/java/de/mari_023/fabric/ae2wtlib/wit/WITScreen.java
@@ -142,14 +142,14 @@ public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
         InputUtil.Key input = InputUtil.fromKeyCode(keyCode, scanCode);
         if(keyCode != GLFW.GLFW_KEY_ESCAPE) {
             if(AppEng.instance().isActionKey(ActionKey.TOGGLE_FOCUS, input)) {
-                searchField.setFocused(!searchField.isFocused());
+                searchField.setTextFieldFocused(!searchField.isFocused());
                 return true;
             }
 
             // Forward keypresses to the search field
             if(searchField.isFocused()) {
                 if(keyCode == GLFW.GLFW_KEY_ENTER) {
-                    searchField.setFocused(false);
+                    searchField.setTextFieldFocused(false);
                     return true;
                 }