diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java b/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java
index b19725c1f..84df7fad8 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java
@@ -1,5 +1,6 @@
 package com.hbm.inventory.container;
 
+import com.hbm.items.block.ItemBlockStorageCrate;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
@@ -18,8 +19,15 @@ public class ContainerCrateBase extends ContainerBase {
 	@Override
 	public ItemStack slotClick(int index, int button, int mode, EntityPlayer player) {
 		// prevents the player from moving around the currently open box
-		if(mode == 2 && button == player.inventory.currentItem) return null;
-		if(index == player.inventory.currentItem + 27 + this.tile.getSizeInventory()) return null;
+		if(player.inventory.getStackInSlot(player.inventory.currentItem) != null &&
+			player.inventory.getStackInSlot(player.inventory.currentItem).getItem() instanceof ItemBlockStorageCrate) {
+			if (mode == 2 && button == player.inventory.currentItem) {
+				return null;
+			}
+			if (index == player.inventory.currentItem + 27 + this.tile.getSizeInventory()) {
+				return null;
+			}
+		}
 		return super.slotClick(index, button, mode, player);
 	}