diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 0ae633aa0..da7ce6557 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -253,6 +253,8 @@ namespace MWGui
 
     void InventoryWindow::open()
     {
+        mPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+
         updateEncumbranceBar();
 
         mItemView->update();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index be71bebee..30173a2d6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2138,6 +2138,7 @@ namespace MWWorld
 
     void World::updateAnimParts(const Ptr& actor)
     {
-        mRendering->updateAnimParts(actor);
+        if (actor.mCell && actor.mCell == mWorldScene->getCurrentCell())
+            mRendering->updateAnimParts(actor);
     }
 }