diff --git a/src/gui/Base/HDrawer.qml b/src/gui/Base/HDrawer.qml
index 3432bbc5..df6ea6a8 100644
--- a/src/gui/Base/HDrawer.qml
+++ b/src/gui/Base/HDrawer.qml
@@ -81,8 +81,10 @@ Drawer {
 
     // FIXME: https://bugreports.qt.io/browse/QTBUG-59141
     // dragMargin: parent.width / 2
+    // interactive: collapse || forceCollapse
+    dragMargin: 0
+    interactive: false
 
-    interactive: collapse || forceCollapse
     position: 1
     visible: ! collapse && ! forceCollapse
     modal: false
diff --git a/src/gui/Pages/Chat/RoomHeader.qml b/src/gui/Pages/Chat/RoomHeader.qml
index a8febce8..09e7ae1b 100644
--- a/src/gui/Pages/Chat/RoomHeader.qml
+++ b/src/gui/Pages/Chat/RoomHeader.qml
@@ -22,13 +22,6 @@ Rectangle {
     HRowLayout {
         id: row
         anchors.fill: parent
-        visible: opacity > 0
-
-        // The layout overflows somehow when focusing the room pane and
-        // is visible behind it (with a transparent theme)
-        opacity: showRightButton && chat.roomPane.visible ? 0 : 1
-
-        Behavior on opacity { HNumberAnimation {} }
 
         HButton {
             id: goToMainPaneButton