diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index eb800ef9a..b931cd370 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -698,9 +698,6 @@ namespace MWGui
             case GM_RestBed:
                 mWaitDialog->exit();
                 break;
-            case GM_Levelup:
-                mLevelupDialog->exit();
-                break;
             case GM_Name:
             case GM_Race:
             case GM_Class:
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 6206985dd..2d78e7875 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -642,6 +642,14 @@ namespace MWInput
             return;
         }
 
+        if(MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Dialogue) { //Give access to the main menu when at a choice in Dialogue
+            if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
+                MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+                MWBase::Environment::get().getSoundManager()->pauseSounds (MWBase::SoundManager::Play_TypeSfx);
+                return;
+            }
+        }
+
         if(!MWBase::Environment::get().getWindowManager()->isGuiMode()) //No open GUIs, open up the MainMenu
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);