diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 4698a1b9f..bd624bd37 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -84,7 +84,7 @@ namespace MWClass
 
             virtual bool getStance (const MWWorld::Ptr& ptr, Stance stance, bool ignoreForce = false)
                 const;
-            ////< Check if a stance is active or not.
+            ///< Check if a stance is active or not.
 
             virtual float getSpeed (const MWWorld::Ptr& ptr) const;
             ///< Return movement speed.
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 72e990283..006729b33 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -55,6 +55,7 @@ namespace MWInput
         , mPreviewPOVDelay(0.f)
         , mTimeIdle(0.f)
         , mOverencumberedMessageDelay(0.f)
+        , mAlwaysRunActive(false)
     {
         Ogre::RenderWindow* window = mOgre.getWindow ();
         size_t windowHnd;
@@ -315,10 +316,10 @@ namespace MWInput
             else
                 mPlayer.setUpDown (0);
 
-            if(actionIsActive(A_Run))
-                mPlayer.setRunState(true);
+            if (mAlwaysRunActive)
+                mPlayer.setRunState(!actionIsActive(A_Run));
             else
-                mPlayer.setRunState(false);
+                mPlayer.setRunState(actionIsActive(A_Run));
 
             // if player tried to start moving, but can't (due to being overencumbered), display a notification.
             if (triedToMove)
@@ -699,7 +700,7 @@ namespace MWInput
     void InputManager::toggleWalking()
     {
         if (mWindows.isGuiMode()) return;
-        mPlayer.toggleRunning();
+        mAlwaysRunActive = !mAlwaysRunActive;
     }
 
     // Exit program now button (which is disabled in GUI mode)
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 34c832756..e181fb351 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -152,6 +152,7 @@ namespace MWInput
         int mMouseWheel;
         bool mDebug;
         bool mUserFileExists;
+        bool mAlwaysRunActive;
 
         std::map<std::string, bool> mControlSwitch;
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 2bc4941a2..71b24b65d 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -117,11 +117,6 @@ namespace MWWorld
         return false;
     }
 
-    bool Class::getForceStance (const Ptr& ptr, Stance stance) const
-    {
-        return false;
-    }
-
     float Class::getSpeed (const Ptr& ptr) const
     {
         return 0;
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index d36e3bc58..1a6a16ca0 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -131,9 +131,6 @@ namespace MWWorld
             virtual void setForceStance (const Ptr& ptr, Stance stance, bool force) const;
             ///< Force or unforce a stance.
 
-            virtual bool getForceStance (const Ptr& ptr, Stance stance) const;
-            ///< Check if a stance forced.
-
             virtual void setStance (const Ptr& ptr, Stance stance, bool set) const;
             ///< Set or unset a stance.
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 5407e3a68..0dc8b37ef 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -77,15 +77,6 @@ namespace MWWorld
         MWWorld::Class::get(ptr).setStance(ptr, MWWorld::Class::Run, run);
     }
 
-    void Player::toggleRunning()
-    {
-        MWWorld::Ptr ptr = getPlayer();
-
-        bool running = MWWorld::Class::get (ptr).getForceStance(ptr, MWWorld::Class::Run);
-
-        MWWorld::Class::get (ptr).setForceStance(ptr, MWWorld::Class::Run, !running);
-    }
-
     void Player::setSneak(bool sneak)
     {
         MWWorld::Ptr ptr = getPlayer();
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 5f2fc3a08..d82d3fc32 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -66,7 +66,6 @@ namespace MWWorld
         void setUpDown(int value);
 
         void setRunState(bool run);
-        void toggleRunning();
         void setSneak(bool sneak);
     };
 }