1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index d4ecf75d..59ec8939 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -35,6 +35,7 @@
 #include "resources/image.h"
 
 #include <guichan/exception.hpp>
+#include <guichan/focushandler.hpp>
 
 int Window::instances = 0;
 int Window::mouseResize = 0;
@@ -285,6 +286,14 @@ void Window::widgetHidden(const gcn::Event &event)
     {
         gui->setCursorType(Gui::CURSOR_POINTER);
     }
+
+    WidgetListIterator it;
+
+    for (it = mWidgets.begin(); it != mWidgets.end(); it++)
+    {
+        if (mFocusHandler->isFocused(*it))
+            mFocusHandler->focusNone();
+    }
 }
 
 void Window::setCloseButton(bool flag)