diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index 95eb616381..61e83a84d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -102,6 +102,13 @@ public class CraftInventoryView extends InventoryView {
                     type = SlotType.CRAFTING;
                 }
                 break;
+            case MERCHANT:
+                if (slot == 2) {
+                    type = SlotType.RESULT;
+                } else {
+                    type = SlotType.CRAFTING;
+                }
+                break;
             default:
                 // Nothing to do, it's a CONTAINER slot
             }