diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 00a58523d..713f1bb3b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -260,7 +260,11 @@ void CharacterController::skipAnim()
 void CharacterController::setState(CharacterState state, bool loop)
 {
     if(mState == state)
+    {
+        if(mAnimation)
+            mAnimation->setLooping(loop);
         return;
+    }
     mState = state;
 
     if(!mAnimation)
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 1a606992a..da91af005 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -169,6 +169,11 @@ void Animation::setSpeed(float speed)
         mAnimSpeedMult = speed / mAnimVelocity;
 }
 
+void Animation::setLooping(bool loop)
+{
+    mLooping = loop;
+}
+
 
 void Animation::applyAnimation(const Ogre::Animation *anim, float time, Ogre::SkeletonInstance *skel)
 {
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index fc35c06be..2f930e9ad 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -76,6 +76,8 @@ public:
 
     void setSpeed(float speed);
 
+    void setLooping(bool loop);
+
     void play(const std::string &groupname, const std::string &start, bool loop);
     virtual Ogre::Vector3 runAnimation(float timepassed);
 };