1 files changed, 10 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 10ec4868..ce269bfa 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -268,8 +268,16 @@ void do_input()
             // Input chat window
             else if ((keysym.sym == SDLK_RETURN) && !chatWindow->isFocused())
             {
-                chatWindow->requestChatFocus();
-                used = true;
+                // Quit by pressing Enter if the exit confirm is there
+                if ( exitConfirm )
+                {
+                    state = EXIT;
+                }
+                else // Else, open the chat edit box
+                {
+                    chatWindow->requestChatFocus();
+                    used = true;
+                }
             }
             
             // Emotions and some internal gui windows