diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 9b7fe98bd..efa326a98 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -180,7 +180,9 @@ namespace MWInput
             switch (action)
             {
             case A_GameMenu:
-                toggleMainMenu ();
+                if(!(MWWorld::Class::get(mPlayer->getPlayer()).getCreatureStats(mPlayer->getPlayer()).isDead() 
+                        && MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_MainMenu ) )
+                    toggleMainMenu ();
                 break;
             case A_Screenshot:
                 screenshot();
@@ -300,7 +302,9 @@ namespace MWInput
             return;
 
         // Disable movement in Gui mode
-        if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode() 
+                || MWWorld::Class::get(mPlayer->getPlayer()).getCreatureStats(mPlayer->getPlayer()).isDead() ) 
+            return;
 
 
         // Configure player movement according to keyboard input. Actual movement will
@@ -367,29 +371,28 @@ namespace MWInput
                 }
             }
 
-            MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
-            if ( !player.getClass().getCreatureStats(player).isDead() ) {
-                if (mControlSwitch["playerviewswitch"]) {
-                    // work around preview mode toggle when pressing Alt+Tab
-                    if (actionIsActive(A_TogglePOV) && !mInputManager->isModifierHeld(SDL_Keymod(KMOD_ALT))) {
+
+            if (mControlSwitch["playerviewswitch"]) {
+                // work around preview mode toggle when pressing Alt+Tab
+                if (actionIsActive(A_TogglePOV) && !mInputManager->isModifierHeld(SDL_Keymod(KMOD_ALT))) {
                     
-                        if (mPreviewPOVDelay <= 0.5 &&
-                            (mPreviewPOVDelay += dt) > 0.5)
-                        {
-                            mPreviewPOVDelay = 1.f;
-                            MWBase::Environment::get().getWorld()->togglePreviewMode(true);
-                        }
-                    } else {
-                        if (mPreviewPOVDelay > 0.5) {
-                            //disable preview mode
-                            MWBase::Environment::get().getWorld()->togglePreviewMode(false);
-                        } else if (mPreviewPOVDelay > 0.f) {
-                            MWBase::Environment::get().getWorld()->togglePOV();
-                        }
-                        mPreviewPOVDelay = 0.f;
+                    if (mPreviewPOVDelay <= 0.5 &&
+                        (mPreviewPOVDelay += dt) > 0.5)
+                    {
+                        mPreviewPOVDelay = 1.f;
+                        MWBase::Environment::get().getWorld()->togglePreviewMode(true);
                     }
+                } else {
+                    if (mPreviewPOVDelay > 0.5) {
+                        //disable preview mode
+                        MWBase::Environment::get().getWorld()->togglePreviewMode(false);
+                    } else if (mPreviewPOVDelay > 0.f) {
+                        MWBase::Environment::get().getWorld()->togglePOV();
+                    }
+                    mPreviewPOVDelay = 0.f;
                 }
             }
+            
         }
         if (actionIsActive(A_MoveForward) ||
             actionIsActive(A_MoveBackward) ||
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c8eba20d6..1c4979e37 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1061,11 +1061,11 @@ bool CharacterController::kill()
     if( isDead() )
 	{
 		//player death animation is over: toggle game menu without 'return' option
-        if( mPtr == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() 
-            && !isAnimPlaying(mCurrentDeath) )
+        if( mPtr == MWBase::Environment::get().getWorld()->getPlayer().getPlayer()
+            && !isAnimPlaying(mCurrentDeath) && MWBase::Environment::get().getWindowManager()->getMode () != MWGui::GM_MainMenu )
         {
-            MWBase::Environment::get().getWindowManager()->setMainMenuNoReturn(true);
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);    
+            MWWorld::Class::get(mPtr).getCreatureStats(mPtr).setHealth(0);
+            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         }
         return false;
     }
@@ -1106,10 +1106,13 @@ bool CharacterController::kill()
 
     if(mAnimation)
     {
-        if (mPtr == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() 
-                && MWBase::Environment::get().getWorld()->getCamera()->isFirstPerson() )
-            MWBase::Environment::get().getWorld()->togglePOV();
-
+        if (mPtr == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+        {
+            MWBase::Environment::get().getWindowManager()->setMainMenuNoReturn(true);
+            if (MWBase::Environment::get().getWorld()->getCamera()->isFirstPerson() )
+                  MWBase::Environment::get().getWorld()->togglePOV();
+        }
+          
         mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::Group_All,
                          false, 1.0f, "start", "stop", 0.0f, 0);
         mAnimation->disable(mCurrentIdle);