diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index ab0148e9..1f5f406a 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -159,6 +159,7 @@ Page {
         }
 
         ColumnLayout {
+            visible: TimelineManager.timeline != null
             anchors.fill: parent
 
             Rectangle {
@@ -287,7 +288,6 @@ Page {
 
                 property int delegateMaxWidth: (Settings.timelineMaxWidth > 100 && (parent.width - Settings.timelineMaxWidth) > scrollbar.width * 2) ? Settings.timelineMaxWidth : (parent.width - scrollbar.width * 2)
 
-                visible: TimelineManager.timeline != null
                 cacheBuffer: 400
                 Layout.fillWidth: true
                 Layout.fillHeight: true
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 6ac5ee15..5c3dac95 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -32,6 +32,7 @@ Item {
 
         MouseArea {
             id: mouseArea
+
             enabled: model.data.type == MtxEvent.ImageMessage && img.status == Image.Ready
             hoverEnabled: true
             anchors.fill: parent
@@ -40,23 +41,23 @@ Item {
 
         Item {
             id: overlay
-        
+
             anchors.fill: parent
             visible: mouseArea.containsMouse
 
             Rectangle {
                 id: container
-                
+
                 width: parent.width
                 implicitHeight: imgcaption.implicitHeight
-                anchors.bottom: overlay.bottom 
+                anchors.bottom: overlay.bottom
                 color: colors.window
                 opacity: 0.75
             }
 
             Text {
                 id: imgcaption
-                
+
                 anchors.fill: container
                 elide: Text.ElideMiddle
                 horizontalAlignment: Text.AlignHCenter
@@ -65,6 +66,9 @@ Item {
                 text: model.data.filename ? model.data.filename : model.data.body
                 color: colors.text
             }
+
         }
+
     }
+
 }