diff --git a/imports/Spectral/Page/Room.qml b/imports/Spectral/Page/Room.qml
index ffdd3a7..bd55905 100644
--- a/imports/Spectral/Page/Room.qml
+++ b/imports/Spectral/Page/Room.qml
@@ -2,5 +2,4 @@ import QtQuick 2.9
 
 RoomForm {
     roomListModel.onNewMessage: if (!window.active) spectralController.showMessage(roomName, content, icon)
-    roomListModel.onRoomAdded: if (room) room.getPreviousContent(5)
 }
diff --git a/imports/Spectral/Panel/RoomListDelegate.qml b/imports/Spectral/Panel/RoomListDelegate.qml
index 00177cf..ecabadb 100644
--- a/imports/Spectral/Panel/RoomListDelegate.qml
+++ b/imports/Spectral/Panel/RoomListDelegate.qml
@@ -25,6 +25,7 @@ Rectangle {
                 inviteDialog.currentRoom = currentRoom
                 inviteDialog.open()
             } else {
+                listView.currentIndex = index
                 enteredRoom = currentRoom
             }
         }