diff --git a/src/windows/room/chat.rs b/src/windows/room/chat.rs
index 66f1a8a..680b669 100644
--- a/src/windows/room/chat.rs
+++ b/src/windows/room/chat.rs
@@ -262,6 +262,7 @@ impl ChatState {
 
                 self.tbox.set_text(text);
                 self.editing = self.scrollback.get_key(info);
+                self.focus = RoomFocus::MessageBar;
 
                 Ok(None)
             },