diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java
index 20dd5434..06283688 100644
--- a/src/main/java/codechicken/nei/ItemsGrid.java
+++ b/src/main/java/codechicken/nei/ItemsGrid.java
@@ -153,9 +153,9 @@ public class ItemsGrid
             validColumn = true;
 
             for (int r = 0; r < rows; r++) {
-
-                if (!slotValid(gui, r, c) && !invalidSlotMap[columns * r + c]) {
-                    invalidSlotMap[columns * r + c] = true;
+                final int idx = columns * r + c;
+                if (!slotValid(gui, r, c) && idx >= 0 && idx < invalidSlotMap.length && !invalidSlotMap[idx]) {
+                    invalidSlotMap[idx] = true;
                     validColumn = false;
                     perPage--;
                 }
@@ -194,7 +194,7 @@ public class ItemsGrid
 
     public boolean isInvalidSlot(int idx)
     {
-        return invalidSlotMap[idx] == true;
+        return invalidSlotMap[idx];
     }
 
     public void draw(int mousex, int mousey)
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java
index 6cf75c42..c4e7c95a 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java
@@ -692,9 +692,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve
     @Override
     public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
         // Because some of the handlers *cough avaritia* are oversized
-        Rectangle rect = new Rectangle(area);
-
-        return rect.contains(x, y, w, h);
+        return area.intersects(x, y, w, h);
     }
 
 }