diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index c0a30206b..1cb1d80b0 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -248,6 +248,9 @@ namespace MWGui
             delete mCharGen;
             mCharGen = new CharacterCreation();
             mGuiModes.clear();
+            mHud->unsetSelectedWeapon();
+            mHud->unsetSelectedSpell();
+            unsetForceHide(GW_ALL);
         }
         else
             allow(GW_ALL);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f0c55c43e..aceb9fe34 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -240,12 +240,13 @@ namespace MWWorld
         // Rebuild player
         setupPlayer();
         MWWorld::Ptr player = mPlayer->getPlayer();
-        renderPlayer();
-        mRendering->resetCamera();
 
         // removes NpcStats, ContainerStore etc
         player.getRefData().setCustomData(NULL);
 
+        renderPlayer();
+        mRendering->resetCamera();
+
         // make sure to do this so that local scripts from items that were in the players inventory are removed
         mLocalScripts.clear();