diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index 8ca0ccc5f8..dadfce6e6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -133,7 +133,7 @@ public class CraftInventoryView extends InventoryView {
                 } else if (slot > 35) {
                     type = SlotType.QUICKBAR;
                 }
-            } else if (slot >= (inventory.countSlots() - 9)) {
+            } else if (slot >= (inventory.countSlots() - (9 + 4 + 1))) { // Quickbar, Armor, Offhand
                 type = SlotType.QUICKBAR;
             }
         }