From 94dd69ea02d5a0214e98ad4b208ac24eb8849aa8 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Fri, 21 Jul 2023 15:50:16 +0200
Subject: [PATCH] Scroll to top of RoomDrawer on loading of header

(cherry picked from commit c8b4da2b96efca95feed1e04f483fb0c85724b92)
---
 src/qml/Panel/RoomDrawer.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qml/Panel/RoomDrawer.qml b/src/qml/Panel/RoomDrawer.qml
index b65ec2c0d..c57c0e5db 100644
--- a/src/qml/Panel/RoomDrawer.qml
+++ b/src/qml/Panel/RoomDrawer.qml
@@ -73,7 +73,7 @@ Kirigami.OverlayDrawer {
         active: roomDrawer.drawerOpen
 
         sourceComponent: ColumnLayout {
-            readonly property string userSearchText: userListView.headerItem.userListSearchField.text
+            readonly property string userSearchText: userListView.headerItem ? userListView.headerItem.userListSearchField.text : ''
             property alias highlightedUser: userListView.currentIndex
 
             spacing: 0
@@ -128,6 +128,9 @@ Kirigami.OverlayDrawer {
                             Layout.fillWidth: true
                             Layout.topMargin: Kirigami.Units.smallSpacing
                             sourceComponent: room.isDirectChat() ? directChatDrawerHeader : groupChatDrawerHeader
+                            onItemChanged: if (item) {
+                                userListView.positionViewAtBeginning();
+                            }
                         }
 
                         Kirigami.ListSectionHeader {