diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index eefde046..0503f467 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -203,7 +203,7 @@ ScrollView {
             TimelineRow {
                 id: timelinerow
 
-                y: section.active && section.visible ? section.y + section.height : 0
+                y: section.visible && section.active ? section.y + section.height : 0
             }
 
             Connections {
diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index 7dc31464..ab955552 100644
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
@@ -90,7 +90,7 @@ MouseArea {
         // Show the scrollbars
         flickable.flick(0, 0);
         flickable.contentY = newPos;
-        cancelFlickStateTimer.start();
+        cancelFlickStateTimer.restart();
     }
 
     Timer {