1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 9f20d54f..43b1f0d3 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -125,6 +125,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
 	connect(client_.data(), SIGNAL(loggedOut()), this, SLOT(logout()));
 
 	connect(room_list_, &RoomList::roomChanged, this, &ChatPage::changeTopRoomInfo);
+	connect(room_list_, &RoomList::roomChanged, text_input_, &TextInputWidget::focusLineEdit);
 	connect(room_list_, &RoomList::roomChanged, view_manager_, &TimelineViewManager::setHistoryView);
 
 	connect(view_manager_, &TimelineViewManager::unreadMessages, this, [=](const QString &roomid, int count) {