diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 1c78b3dfef..a8bf90ff03 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -146,6 +146,7 @@ namespace MWClass
     {
         // Do not allow equip tools from inventory during attack
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
+            && !MWBase::Environment::get().getMechanicsManager()->isCastingSpell(npc)
             && MWBase::Environment::get().getWindowManager()->isGuiMode())
             return { 0, "#{sCantEquipWeapWarning}" };
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 110614bffd..a46a2aefee 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -144,6 +144,7 @@ namespace MWClass
     {
         // Do not allow equip tools from inventory during attack
         if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
+            && !MWBase::Environment::get().getMechanicsManager()->isCastingSpell(npc)
             && MWBase::Environment::get().getWindowManager()->isGuiMode())
             return { 0, "#{sCantEquipWeapWarning}" };