diff --git a/src/qml/RoomPage.qml b/src/qml/RoomPage.qml
index bc164578a..236bdc9b1 100644
--- a/src/qml/RoomPage.qml
+++ b/src/qml/RoomPage.qml
@@ -174,6 +174,7 @@ Kirigami.Page {
 
     footer: Loader {
         id: chatBarLoader
+        height: active ? item.implicitHeight : 0
         active: timelineViewLoader.active && !root.currentRoom.readOnly
         sourceComponent: ChatBar {
             id: chatBar
diff --git a/src/qml/SpaceHomePage.qml b/src/qml/SpaceHomePage.qml
index f43c3c9a1..8f2df3629 100644
--- a/src/qml/SpaceHomePage.qml
+++ b/src/qml/SpaceHomePage.qml
@@ -22,7 +22,6 @@ ColumnLayout {
     QQC2.Control {
         id: headerItem
         Layout.fillWidth: true
-        Layout.topMargin: Kirigami.Units.smallSpacing
         implicitHeight: headerColumn.implicitHeight
 
         background: Rectangle {