diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 762c472d8..5e3f93ab9 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -518,11 +518,9 @@ namespace MWGui
         MyGUI::Button* byeButton;
         getWidget(byeButton, "ByeButton");
         if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
-            byeButton->setAlpha(.2);
             byeButton->setEnabled(false);
         }
         else {
-            byeButton->setAlpha(1);
             byeButton->setEnabled(true);
         }
     }
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 332c8f6a7..34e026fd7 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -791,8 +791,12 @@ namespace MWInput
         if (!MWBase::Environment::get().getWindowManager()->isGuiMode ()
                 && MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")==-1)
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu);
-        else if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu)
-            MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_QuickKeysMenu);
+        else if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu) {
+            while(MyGUI::InputManager::getInstance().isModalAny()) { //Handle any open Modal windows
+                MWBase::Environment::get().getWindowManager()->getCurrentModal()->exit();
+            }
+            MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode(); //And handle the actual main window
+        }
     }
 
     void InputManager::activate()