diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
index 72ffdf684..91cab7c19 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
@@ -12,7 +12,6 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -812,15 +811,14 @@ private fun RenderImageOrVideo(
     if (content is ZoomableUrlImage) {
         val mainModifier = Modifier
             .fillMaxSize()
-            .zoomable(rememberZoomState())
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null // Avoid flashing on click
-            ) {
-                if (onToggleControllerVisibility != null) {
-                    onToggleControllerVisibility()
+            .zoomable(
+                rememberZoomState(),
+                onTap = {
+                    if (onToggleControllerVisibility != null) {
+                        onToggleControllerVisibility()
+                    }
                 }
-            }
+            )
 
         UrlImageView(
             content = content,
@@ -846,15 +844,14 @@ private fun RenderImageOrVideo(
     } else if (content is ZoomableLocalImage) {
         val mainModifier = Modifier
             .fillMaxSize()
-            .zoomable(rememberZoomState())
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null // Avoid flashing on click
-            ) {
-                if (onToggleControllerVisibility != null) {
-                    onToggleControllerVisibility()
+            .zoomable(
+                rememberZoomState(),
+                onTap = {
+                    if (onToggleControllerVisibility != null) {
+                        onToggleControllerVisibility()
+                    }
                 }
-            }
+            )
 
         LocalImageView(
             content = content,