diff --git a/ui/view-main.go b/ui/view-main.go
index ea24644..2a8a1fe 100644
--- a/ui/view-main.go
+++ b/ui/view-main.go
@@ -270,6 +270,9 @@ func (view *MainView) switchRoom(tag string, room *rooms.Room, lock bool) {
 	view.currentRoom = roomView
 	view.MarkRead(roomView)
 	view.roomList.SetSelected(tag, room)
+	view.flex.SetFocused(view.roomView)
+	view.focused = view.roomView
+	view.roomView.Focus()
 	view.parent.Render()
 
 	if msgView := roomView.MessageView(); len(msgView.messages) < 20 && !msgView.initialHistoryLoaded {