diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index ad356d3ae..c7b1e4f28 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -28,6 +28,7 @@ cInventory::cInventory(cPlayer & a_Owner) :
 	m_ArmorSlots.AddListener(*this);
 	m_InventorySlots.AddListener(*this);
 	m_HotbarSlots.AddListener(*this);
+	m_ShieldSlots.AddListener(*this);
 
 	SetEquippedSlotNum(0);
 }
@@ -792,6 +793,11 @@ void cInventory::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
 	{
 		Base = invHotbarOffset;
 	}
+	else if (a_ItemGrid = &m_ShieldSlots)
+	{
+		Base = invShieldOffset;
+
+	}
 	else
 	{
 		ASSERT(!"Unknown ItemGrid calling OnSlotChanged()");