diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 1cc2c86761..7e4c47993c 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -276,8 +276,8 @@ namespace MWClass
             return { 0, "#{sInventoryMessage1}" };
 
         // Do not allow equip weapons from inventory during attack
-        if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
-            && MWBase::Environment::get().getWindowManager()->isGuiMode())
+        if (npc.isInCell() && MWBase::Environment::get().getWindowManager()->isGuiMode()
+            && MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc))
             return { 0, "#{sCantEquipWeapWarning}" };
 
         std::pair<std::vector<int>, bool> slots_ = getEquipmentSlots(ptr);