diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 088b3daa9a..ae119756be 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -167,6 +167,7 @@ public class CraftContainer extends Container {
                 break; // TODO: This should be an error?
             case PLAYER:
             case CHEST:
+            case ENDER_CHEST:
             case BARREL:
                 delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
                 break;