diff --git a/qml/form/RoomListForm.qml b/qml/form/RoomListForm.qml
index 10738bd..bab3097 100644
--- a/qml/form/RoomListForm.qml
+++ b/qml/form/RoomListForm.qml
@@ -55,6 +55,11 @@ Item {
                         verticalAlignment: Text.AlignVCenter
                     }
                 }
+
+                Shortcut {
+                    sequence: StandardKey.Find
+                    onActivated: searchField.forceActiveFocus()
+                }
             }
         }
 
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index 062ffed..91d1aae 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -67,6 +67,7 @@ void RoomListModel::connectRoomSignals(MatriqueRoom* room) {
   connect(room, &QMatrixClient::Room::aboutToAddNewMessages, this,
           [=](QMatrixClient::RoomEventsRange eventsRange) {
             RoomEvent* event = (eventsRange.end() - 1)->get();
+            if (event->isStateEvent()) return;
             User* sender = room->user(event->senderId());
             if (sender == room->localUser()) return;
             emit newMessage(room->displayName(),