diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
index 0acae6b694..7d71b26234 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
@@ -71,18 +71,6 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActionBarActivity
     this.closeButton = findViewById(R.id.view_once_close_button);
     this.uri         = getIntent().getParcelableExtra(KEY_URI);
 
-    ViewOnceGestureListener imageListener = new ViewOnceGestureListener(image);
-    GestureDetector         imageDetector = new GestureDetector(this, imageListener);
-
-    ViewOnceGestureListener videoListener = new ViewOnceGestureListener(video);
-    GestureDetector         videoDetector = new GestureDetector(this, videoListener);
-
-    image.setOnTouchListener((view, event) -> imageDetector.onTouchEvent(event));
-    image.setOnClickListener(v -> finish());
-
-    video.setOnTouchListener((view, event) -> videoDetector.onTouchEvent(event));
-    video.setOnClickListener(v -> finish());
-
     closeButton.setOnClickListener(v -> finish());
 
     initViewModel(getIntent().getLongExtra(KEY_MESSAGE_ID, -1), uri);
diff --git a/app/src/main/res/layout/view_once_message_activity.xml b/app/src/main/res/layout/view_once_message_activity.xml
index cb469ab5c7..58fd715094 100644
--- a/app/src/main/res/layout/view_once_message_activity.xml
+++ b/app/src/main/res/layout/view_once_message_activity.xml
@@ -18,14 +18,24 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <ImageView
-        android:id="@+id/view_once_close_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="19dp"
-        android:layout_marginStart="19dp"
-        android:tint="@color/core_white"
-        app:srcCompat="@drawable/ic_x"/>
+    <!-- Need this wrapper layout to get the ripple to show correctly. https://issuetracker.google.com/issues/111819099 -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/transparent">
+
+        <ImageView
+            android:id="@+id/view_once_close_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="15dp"
+            android:padding="4dp"
+            android:tint="@color/core_white"
+            android:background="?selectableItemBackgroundBorderless"
+            app:srcCompat="@drawable/ic_x"/>
+
+    </FrameLayout>
 
     <TextView
         android:id="@+id/view_once_duration"