diff --git a/TODO.md b/TODO.md
index 93b5324f..9ff22c4a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,7 @@
 # TODO
 
+- Avatar tooltip can get displayed in front of presence menu
+
 - global presence control
 
 - fix members not synced bug
diff --git a/src/gui/Pages/Chat/Timeline/EventDelegate.qml b/src/gui/Pages/Chat/Timeline/EventDelegate.qml
index dafaf02c..e5d2633f 100644
--- a/src/gui/Pages/Chat/Timeline/EventDelegate.qml
+++ b/src/gui/Pages/Chat/Timeline/EventDelegate.qml
@@ -94,8 +94,8 @@ HColumnLayout {
 
     Item {
         Layout.fillWidth: true
-        Layout.preferredHeight:
-            model.event_type === "RoomCreateEvent" ? 0 : separationSpacing
+        visible: model.event_type !== "RoomCreateEvent"
+        Layout.preferredHeight: separationSpacing
     }
 
     Daybreak {
@@ -103,13 +103,7 @@ HColumnLayout {
 
         Layout.fillWidth: true
         Layout.minimumWidth: parent.width
-    }
-
-    Item {
-        visible: dayBreak
-
-        Layout.fillWidth: true
-        Layout.preferredHeight: separationSpacing
+        Layout.bottomMargin: separationSpacing
     }
 
     EventContent {