diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index f39a4b961c..7178a2556b 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1024,8 +1024,27 @@ namespace MWMechanics
     {
         ptr.getClass().getCreatureStats(ptr).getAiSequence().stack(MWMechanics::AiCombat(target), ptr);
         if (target == MWBase::Environment::get().getWorld()->getPlayerPtr())
+        {
             ptr.getClass().getCreatureStats(ptr).setHostile(true);
 
+            // if guard starts combat with player, guards pursuing player should do the same
+            if (ptr.getClass().isClass(ptr, "Guard"))
+            {
+                for (Actors::PtrControllerMap::const_iterator iter = mActors.begin(); iter != mActors.end(); ++iter)
+                {
+                    if (iter->first.getClass().isClass(iter->first, "Guard"))
+                    {
+                        MWMechanics::AiSequence& aiSeq = iter->first.getClass().getCreatureStats(iter->first).getAiSequence();
+                        if (aiSeq.getActivePackage()->getTypeId() == MWMechanics::AiPackage::TypeIdPursue)
+                        {
+                            aiSeq.stopPursuit();
+                            aiSeq.stack(MWMechanics::AiCombat(target), ptr);
+                        }
+                    }
+                }
+            }
+        }
+
         // Must be done after the target is set up, so that CreatureTargetted dialogue filter works properly
         if (ptr.getClass().isNpc())
             MWBase::Environment::get().getDialogueManager()->say(ptr, "attack");