diff --git a/TODO.md b/TODO.md
index 4a4d7aea..21660b23 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,6 @@
 # TODO
 
 - Image viewer: 
-    - stop timeline gif on ctrl+o
     - open externally in context menu in timeline thumbnail
     - hflickable support kinetic scrolling disabler and speed/decel settings
     - keyboard controls
diff --git a/src/gui/Pages/Chat/Timeline/EventImage.qml b/src/gui/Pages/Chat/Timeline/EventImage.qml
index c495aae7..a1ef4403 100644
--- a/src/gui/Pages/Chat/Timeline/EventImage.qml
+++ b/src/gui/Pages/Chat/Timeline/EventImage.qml
@@ -62,6 +62,11 @@ HMxcImage {
     onCachedPathChanged:
         eventList.thumbnailCachedPaths[loader.singleMediaInfo.id] = cachedPath
 
+    Binding on pause {
+        value: true
+        when: Object.keys(window.visiblePopups).length > 0
+    }
+
     TapHandler {
         acceptedButtons: Qt.LeftButton
         acceptedModifiers: Qt.NoModifier
@@ -73,12 +78,7 @@ HMxcImage {
                 return
             }
 
-            const wasPaused = image.pause
-            image.pause     = true
-
-            eventList.openImageViewer(singleMediaInfo, "", popup => {
-                popup.closed.connect(() => image.pause = wasPaused)
-            })
+            eventList.openImageViewer(singleMediaInfo)
         }
     }