diff --git a/cockatrice/src/tab_message.cpp b/cockatrice/src/tab_message.cpp
index 80a56154..eec46bb9 100644
--- a/cockatrice/src/tab_message.cpp
+++ b/cockatrice/src/tab_message.cpp
@@ -34,6 +34,10 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
 
     retranslateUi();
     setLayout(vbox);
+    
+    setFocusProxy(sayEdit);
+    chatView->setFocusProxy(sayEdit);
+    sayEdit->setFocus();
 }
 
 TabMessage::~TabMessage()
diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp
index 79673e0f..a7514e79 100644
--- a/cockatrice/src/tab_room.cpp
+++ b/cockatrice/src/tab_room.cpp
@@ -9,6 +9,7 @@
 #include <QLabel>
 #include <QToolButton>
 #include <QSplitter>
+#include <QTimer>
 #include "tab_supervisor.h"
 #include "tab_room.h"
 #include "tab_userlists.h"
@@ -97,6 +98,10 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     const int gameListSize = info.game_list_size();
     for (int i = 0; i < gameListSize; ++i)
         gameSelector->processGameInfo(info.game_list(i));
+
+    setFocusProxy(sayEdit);
+    chatView->setFocusProxy(sayEdit);
+    QTimer::singleShot(0, sayEdit, SLOT(setFocus()));
 }
 
 TabRoom::~TabRoom()