diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java
index 44491290d..006c2684c 100644
--- a/src/main/java/codechicken/nei/ItemPanel.java
+++ b/src/main/java/codechicken/nei/ItemPanel.java
@@ -528,11 +528,10 @@ public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int
             List<String> currenttip) {
         final ItemPanelGrid panelGrid = ((ItemPanelGrid) this.grid);
 
-        if (!panelGrid.forceExpand) {
+        if (!panelGrid.forceExpand && !NEIClientConfig.isHidden() && !currenttip.isEmpty()) {
             final ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
 
             if (hoverSlot != null) {
-
                 final MaskMetadata metadata = panelGrid.maskMetadata.get(hoverSlot.slotIndex);
 
                 if (metadata != null) {