1 files changed, 8 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e834410f..a6a9d866 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -273,6 +273,14 @@ void do_input()
                 {
                     state = EXIT;
                 }
+                else if ( helpWindow->isVisible() ) // Close the Browser if opened
+                {
+                    helpWindow->setVisible(false);
+                }
+                else if ( setupWindow->isVisible() ) // Close the config window, applying changes if opened
+                {
+                    setupWindow->action("apply");
+                }
                 else // Else, open the chat edit box
                 {
                     chatWindow->requestChatFocus();