diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java
index df79166f..e28c2c15 100644
--- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java
+++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java
@@ -119,10 +119,10 @@ public class GuiCraftGUI extends GuiContainer {
             window.getTooltip(tooltip);
         }
 
-        NEIHook.renderToolTips(mouseX, mouseY);
-
         if (tooltip.exists()) {
             renderTooltip(new IPoint(mouseX, mouseY), tooltip);
+        } else {
+            NEIHook.renderToolTips(mouseX, mouseY);
         }
         zLevel = 0.0f;
         GL11.glEnable(GL11.GL_LIGHTING);
diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java
index 0e6344e4..4c72284e 100644
--- a/src/main/java/binnie/core/craftgui/minecraft/Window.java
+++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java
@@ -29,6 +29,7 @@ import binnie.core.craftgui.minecraft.control.ControlHelp;
 import binnie.core.craftgui.minecraft.control.ControlInfo;
 import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
+import binnie.core.craftgui.minecraft.control.ControlSlotBase;
 import binnie.core.craftgui.minecraft.control.ControlUser;
 import binnie.core.craftgui.minecraft.control.EnumHighlighting;
 import binnie.core.craftgui.renderer.Renderer;
@@ -40,6 +41,7 @@ import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.IInventoryMachine;
 import binnie.core.machines.network.INetwork;
 import binnie.core.machines.power.PowerSystem;
+import binnie.core.nei.NEIHook;
 import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.resource.BinnieResource;
 import binnie.core.resource.ResourceType;
@@ -118,6 +120,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
                 if (!widget.calculateIsMouseOver()) {
                     continue;
                 }
+                if (NEIHook.enabled && widget instanceof ControlSlotBase) {
+                    return;
+                }
                 if (widget instanceof ITooltip) {
                     ((ITooltip) widget).getTooltip(tooltip);
                     if (tooltip.exists()) {