diff --git a/src/main/java/codechicken/nei/ItemZoom.java b/src/main/java/codechicken/nei/ItemZoom.java
index fc4b1b26..b029a1cb 100644
--- a/src/main/java/codechicken/nei/ItemZoom.java
+++ b/src/main/java/codechicken/nei/ItemZoom.java
@@ -42,7 +42,7 @@ public class ItemZoom extends Widget implements IContainerInputHandler {
 
         if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2
                 && (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
-                        || KeyManager.isHashDown("itemzoom.hold"))
+                        || KeyManager.isKeyDown("itemzoom.hold"))
                 && GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) {
             final float inverseScaleFactor = 1.0f / this.scale;
             final float screenScale = getScreenScale();
@@ -204,18 +204,18 @@ public class ItemZoom extends Widget implements IContainerInputHandler {
             return true;
         }
 
-        if (this.stack != null && KeyManager.isHashDown("itemzoom.hold")) {
+        if (this.stack != null && KeyManager.isKeyDown("itemzoom.hold")) {
             return true;
         }
 
-        if (this.stack != null && KeyManager.isHashDown("itemzoom.zoom_in")) {
+        if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_in")) {
             increaseZoom(gui);
             previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
             Keyboard.enableRepeatEvents(true);
             return true;
         }
 
-        if (this.stack != null && KeyManager.isHashDown("itemzoom.zoom_out")) {
+        if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_out")) {
             decreaseZoom(gui);
             previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
             Keyboard.enableRepeatEvents(true);
diff --git a/src/main/java/codechicken/nei/KeyManager.java b/src/main/java/codechicken/nei/KeyManager.java
index d8790a42..84ceadc6 100644
--- a/src/main/java/codechicken/nei/KeyManager.java
+++ b/src/main/java/codechicken/nei/KeyManager.java
@@ -67,17 +67,19 @@ public class KeyManager {
     }
 
     public static boolean isKeyDown(String ident) {
-        final int keyCode = getKeyCode(ident);
+        final KeyBinding binding = getKeyBinding(ident);
 
-        if (keyCode == Keyboard.KEY_NONE) {
-            return false;
+        if (binding != null) {
+            final int keyCode = binding.getKeyCode();
+
+            if (keyCode < 0) {
+                return Mouse.isButtonDown(keyCode + 100);
+            } else if (keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE) {
+                return Keyboard.isKeyDown(keyCode);
+            }
         }
 
-        if (keyCode < 0) {
-            return Mouse.isButtonDown(keyCode + 100);
-        }
-
-        return keyCode < Keyboard.KEYBOARD_SIZE && Keyboard.isKeyDown(keyCode);
+        return false;
     }
 
     public static boolean isHashDown(String ident) {
diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java
index 254cbdec..f5944bb2 100644
--- a/src/main/java/codechicken/nei/LayoutManager.java
+++ b/src/main/java/codechicken/nei/LayoutManager.java
@@ -224,12 +224,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
 
-        if (KeyManager.isHashDown("gui.hide")) {
+        if (KeyManager.isKeyDown("gui.hide")) {
             toggleBooleanSetting("inventory.hidden");
             return true;
         }
 
-        if (KeyManager.isHashDown("bookmark.hide")) {
+        if (KeyManager.isKeyDown("bookmark.hide")) {
             toggleBooleanSetting("inventory.bookmarks.enabled");
             return true;
         }
diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
index c3e65c28..1baca760 100644
--- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
+++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
@@ -144,11 +144,11 @@ public abstract class ShortcutInputHandler {
             return sendRecipeInChatLink(stackover, NEIClientUtils.shiftKey());
         }
 
-        if (KeyManager.isHashDown("recipe.recipe")) {
+        if (KeyManager.isKeyDown("recipe.recipe")) {
             return GuiCraftingRecipe.openRecipeGui("item", stackover);
         }
 
-        if (KeyManager.isHashDown("recipe.usage")) {
+        if (KeyManager.isKeyDown("recipe.usage")) {
             return GuiUsageRecipe.openRecipeGui("item", stackover);
         }
 
diff --git a/src/main/java/codechicken/nei/config/preset/RightPanel.java b/src/main/java/codechicken/nei/config/preset/RightPanel.java
index 347e8feb..79016c0e 100644
--- a/src/main/java/codechicken/nei/config/preset/RightPanel.java
+++ b/src/main/java/codechicken/nei/config/preset/RightPanel.java
@@ -85,11 +85,11 @@ public class RightPanel extends GuiWidget {
                 setFocus(true);
             }
 
-            if (focused() && KeyManager.isHashDown("gui.getprevioussearch")) {
+            if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
                 handleNavigateHistory(TextHistory.Direction.PREVIOUS);
             }
 
-            if (focused() && KeyManager.isHashDown("gui.getnextsearch")) {
+            if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
                 handleNavigateHistory(TextHistory.Direction.NEXT);
             }
         }
diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
index 8536eceb..9e59e8d8 100644
--- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
@@ -289,9 +289,9 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
             if (!canHandle(gui)) return false;
 
-            if (KeyManager.isHashDown("recipe.recipe")) {
+            if (KeyManager.isKeyDown("recipe.recipe")) {
                 return transferRect(gui, false);
-            } else if (KeyManager.isHashDown("recipe.usage")) {
+            } else if (KeyManager.isKeyDown("recipe.usage")) {
                 return transferRect(gui, true);
             }
 
@@ -673,9 +673,9 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     @Override
     public boolean keyTyped(GuiRecipe<?> gui, char keyChar, int keyCode, int recipe) {
 
-        if (KeyManager.isHashDown("recipe.recipe")) {
+        if (KeyManager.isKeyDown("recipe.recipe")) {
             return transferRect(gui, recipe, false);
-        } else if (KeyManager.isHashDown("recipe.usage")) {
+        } else if (KeyManager.isKeyDown("recipe.usage")) {
             return transferRect(gui, recipe, true);
         }