diff --git a/src/framework/ui/uiwidget.cpp b/src/framework/ui/uiwidget.cpp
index d4348828..0d61850d 100644
--- a/src/framework/ui/uiwidget.cpp
+++ b/src/framework/ui/uiwidget.cpp
@@ -845,6 +845,10 @@ bool UIWidget::setRect(const Rect& rect)
         m_updateEventScheduled = true;
     }
 
+    // update hovered widget when moved behind mouse area
+    if(containsPoint(g_window.getMousePosition()))
+        g_ui.updateHoveredWidget();
+
     return true;
 }
 
diff --git a/src/otclient/game.cpp b/src/otclient/game.cpp
index e645565a..917df02d 100644
--- a/src/otclient/game.cpp
+++ b/src/otclient/game.cpp
@@ -779,8 +779,6 @@ void Game::follow(const CreaturePtr& creature)
     if(!canPerformGameAction() || creature == m_localPlayer || creature == m_followingCreature)
         return;
 
-    m_localPlayer->lockWalk();
-
     if(creature && isAttacking())
         cancelAttack();