diff --git a/src/qml/Component/FullScreenImage.qml b/src/qml/Component/FullScreenImage.qml
index 1f8b4743c..3b09ebeb2 100644
--- a/src/qml/Component/FullScreenImage.qml
+++ b/src/qml/Component/FullScreenImage.qml
@@ -204,7 +204,7 @@ Popup {
             Layout.bottomMargin: Kirigami.Units.largeSpacing
             clip: true
 
-            Image {
+            AnimatedImage {
                 id: image
 
                 property var scaleFactor: 1
diff --git a/src/qml/Component/Timeline/ImageDelegate.qml b/src/qml/Component/Timeline/ImageDelegate.qml
index ecd186f30..92c833766 100644
--- a/src/qml/Component/Timeline/ImageDelegate.qml
+++ b/src/qml/Component/Timeline/ImageDelegate.qml
@@ -28,7 +28,7 @@ TimelineContainer {
 
     readonly property var maxWidth: Kirigami.Units.gridUnit * 30
 
-    innerObject: Image {
+    innerObject: AnimatedImage {
         id: img
 
         Layout.maximumWidth: Math.min(imageDelegate.contentMaxWidth, imageDelegate.maxWidth)
@@ -87,6 +87,7 @@ TimelineContainer {
             acceptedButtons: Qt.LeftButton
             onTapped: {
                 img.ToolTip.hide()
+                img.paused = true
                 fullScreenImage.open()
             }
         }
@@ -99,6 +100,8 @@ TimelineContainer {
             imageWidth: content.info.w
             imageHeight: content.info.h
             modelData: model
+
+            onClosed: img.paused = false
         }
 
         function downloadAndOpen() {