diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 2b407ac93..64609cbe6 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -187,6 +187,8 @@ namespace MWGui
 
     void RaceDialog::onClose()
     {
+        WindowModal::onClose();
+
         mPreviewImage->setRenderItemTexture(NULL);
 
         mPreviewTexture.reset(NULL);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index c572bce54..d734d7540 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1738,9 +1738,12 @@ namespace MWGui
         // Only remove the top if it matches the current pointer. A lot of things hide their visibility before showing it,
         //so just popping the top would cause massive issues.
         if(!mCurrentModals.empty())
+        {
             if(input == mCurrentModals.top())
                 mCurrentModals.pop();
-
+            else
+                std::cout << " warning: modal widget " << input << " " << typeid(input).name() << " not found " << std::endl;
+        }
         if (mCurrentModals.empty())
             mKeyboardNavigation->restoreFocus(getMode());
     }