diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index 8747c47d..3b8ceb15 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -13,7 +13,7 @@ Popup {
     property int textHeight: Math.round(Qt.application.font.pixelSize * 2.4)
 
     background: null
-    width: Math.round(parent.width / 2)
+    width: Math.min(Math.max(Math.round(parent.width / 2),450),parent.width) // limiting width to parent.width/2 can be a bit narrow
     x: Math.round(parent.width / 2 - width / 2)
     y: Math.round(parent.height / 4 - height / 2)
     modal: true
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index da205950..b1d09eb1 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -673,6 +673,24 @@ Page {
                     }
                 }
 
+                ImageButton {
+                    visible: !collapsed
+                    Layout.fillWidth: true
+                    hoverEnabled: true
+                    ripple: false
+                    width: 22
+                    height: 22
+                    image: ":/icons/icons/ui/search.svg"
+                    ToolTip.visible: hovered
+                    ToolTip.delay: Nheko.tooltipDelay
+                    ToolTip.text: qsTr("Search rooms (Ctrl+K)")
+                    Layout.margins: Nheko.paddingMedium
+                    onClicked: {
+                        var quickSwitch = quickSwitcherComponent.createObject(timelineRoot);
+                        quickSwitch.open();
+                    }
+                }
+
                 ImageButton {
                     visible: !collapsed
                     Layout.fillWidth: true
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index cc081679..0ff33bf8 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -48,7 +48,7 @@ Item {
     property bool hovered: false
 
     width: parent.width
-    height: childrenRect.height
+    height: row.height+(reactionRow.height > 0 ? reactionRow.height-2 : 0 )
 
     Rectangle {
         color: (Settings.messageHoverHighlight && hovered) ? Nheko.colors.alternateBase : "transparent"