diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index ff213b219..53e80f54e 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -276,8 +276,7 @@ namespace MWMechanics
             completeManualWalking(actor, storage);
         }
 
-        AiWanderStorage::WanderState& wanderState = storage.mState;
-        if ((wanderState == AiWanderStorage::Wander_MoveNow) && storage.mCanWanderAlongPathGrid)
+        if (storage.mState == AiWanderStorage::Wander_MoveNow && storage.mCanWanderAlongPathGrid)
         {
             // Construct a new path if there isn't one
             if(!mPathFinder.isPathConstructed())
@@ -293,8 +292,10 @@ namespace MWMechanics
             completeManualWalking(actor, storage);
         }
 
-        if (wanderState == AiWanderStorage::Wander_Walking
-            && (isDestinationHidden(actor, mPathFinder.getPath().back())
+        if (storage.mIsWanderingManually
+            && storage.mState == AiWanderStorage::Wander_Walking
+            && (mPathFinder.getPathSize() == 0
+                || isDestinationHidden(actor, mPathFinder.getPath().back())
                 || isAreaOccupiedByOtherActor(actor, mPathFinder.getPath().back())))
             completeManualWalking(actor, storage);