diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index bb6b8163e9..e98b75e9be 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -11,11 +11,20 @@ namespace MWGui
 
     MainMenu::MainMenu(int w, int h)
         : OEngine::GUI::Layout("openmw_mainmenu.layout")
+        , mButtonBox(0)
+    {
+        onResChange(w,h);
+    }
+
+    void MainMenu::onResChange(int w, int h)
     {
         setCoord(0,0,w,h);
 
         int height = 64 * 3;
 
+        if (mButtonBox)
+            MyGUI::Gui::getInstance ().destroyWidget(mButtonBox);
+
         mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(w/2 - 64, h/2 - height/2, 128, height), MyGUI::Align::Default);
         int curH = 0;
 
@@ -55,7 +64,6 @@ namespace MWGui
         mExitGame->setImageResource ("Menu_ExitGame");
         mExitGame->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::exitGame);
         curH += 64;
-
     }
 
     void MainMenu::returnToGame(MyGUI::Widget* sender)
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index 5fa2f69430..fd583d1876 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -8,6 +8,8 @@ namespace MWGui
     public:
         MainMenu(int w, int h);
 
+        void onResChange(int w, int h);
+
     private:
         MyGUI::Button* mReturn;
         MyGUI::Button* mNewGame;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index db8401fce9..2a6f7ec9b3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -639,6 +639,7 @@ void WindowManager::processChangedSettings(const Settings::CategorySettingVector
         int y = Settings::Manager::getInt("resolution y", "Video");
         mHud->onResChange(x, y);
         mConsole->onResChange(x, y);
+        mMenu->onResChange(x, y);
         mSettingsWindow->center();
         mAlchemyWindow->center();
         mScrollWindow->center();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index aa3b75ca41..d0019c6b8e 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -776,6 +776,7 @@ void RenderingManager::windowResized(Ogre::RenderWindow* rw)
 
 void RenderingManager::windowClosed(Ogre::RenderWindow* rw)
 {
+    Ogre::Root::getSingleton ().queueEndRendering ();
 }
 
 bool RenderingManager::waterShaderSupported()