diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 50e051ab..b0498c4e 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -194,7 +194,7 @@ ListView {
         Connections {
             target: chat
             onMovementEnded: {
-                if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height)
+                if (y + height + 2 * chat.spacing > chat.contentY + timelineRoot.height && y < chat.contentY + timelineRoot.height)
                     chat.model.currentIndex = index;
 
             }
diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml
index 67a69055..c38cb555 100644
--- a/resources/qml/delegates/NoticeMessage.qml
+++ b/resources/qml/delegates/NoticeMessage.qml
@@ -1,6 +1,6 @@
 TextMessage {
     font.italic: true
     color: colors.buttonText
-    height: isReply ? Math.min(chat.height / 8, implicitHeight) : undefined
+    height: isReply ? Math.min(timelineRoot.height / 8, implicitHeight) : undefined
     clip: isReply
 }