diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 8f14e0331b..c437a21d51 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2168,12 +2168,12 @@ void CharacterController::update(float duration)
         if(mAnimQueue.empty() || inwater || sneak)
         {
             // Note: turning animations should not interrupt idle ones
-            if (inwater)
+            if (movestate != CharState_None && !isTurning())
+                idlestate = CharState_None;
+            else if (inwater)
                 idlestate = CharState_IdleSwim;
             else if (sneak && !inJump)
                 idlestate = CharState_IdleSneak;
-            else if (movestate != CharState_None && !isTurning())
-                idlestate = CharState_None;
             else
                 idlestate = CharState_Idle;
         }