diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index f4ca5ee27..8588547d2 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -134,17 +134,25 @@ namespace MWWorld
 
         ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
 
-        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
-
-        // Find all the actors who might be able to see the player
-        std::vector<MWWorld::Ptr> neighbors;
-        MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
-                                    esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
-        for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
-            if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) ) 
-                MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
-        if (!neighbors.size())
-            MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
+        if (sneak == true)
+        {
+            const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
+
+            // Find all the actors who might be able to see the player
+            std::vector<MWWorld::Ptr> neighbors;
+            MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+                                        esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
+            for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
+            {
+                if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) )
+                { 
+                    MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
+                    break;
+                }
+            }
+            if (neighbors.size() == 0)
+                MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
+        }
     }
 
     void Player::yaw(float yaw)