diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index a05ebac07c..2ea3e2010a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1490,6 +1490,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     void    onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
     void    onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
     void    onInviteToSignal();
+    boolean isInBubble();
   }
 
   private class ConversationScrollListener extends OnScrollListener {
@@ -2109,6 +2110,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
     @Override
     public void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args) {
+      if (listener.isInBubble()) {
+        requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args));
+        return;
+      }
+
       if (args.isVideoGif()) {
         int                            adapterPosition = list.getChildAdapterPosition(parent);
         GiphyMp4ProjectionPlayerHolder holder          = giphyMp4ProjectionRecycler.getCurrentHolder(adapterPosition);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 1b7ae9a637..1aec957fe4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -2267,7 +2267,8 @@ public class ConversationParentFragment extends Fragment
     callback.onInitializeToolbar(toolbar);
   }
 
-  protected boolean isInBubble() {
+  @Override
+  public boolean isInBubble() {
     return callback.isInBubble();
   }