diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index fe26acec8a..a9d4e2560f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2072,7 +2072,7 @@ class ConversationFragment :
 
   private fun handleDisplayDetails(conversationMessage: ConversationMessage) {
     val recipientSnapshot = viewModel.recipientSnapshot ?: return
-    MessageDetailsFragment.create(conversationMessage.messageRecord, recipientSnapshot.id).show(parentFragmentManager, null)
+    MessageDetailsFragment.create(conversationMessage.messageRecord, recipientSnapshot.id).show(childFragmentManager, null)
   }
 
   private fun handleDeleteMessages(messageParts: Set<MultiselectPart>) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsFragment.java
index 989b78beaf..5122e1c3a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsFragment.java
@@ -171,9 +171,9 @@ public final class MessageDetailsFragment extends FullScreenDialogFragment imple
   @Override
   public void onViewEditHistoryClicked(MessageRecord record) {
     if (record.isOutgoing()) {
-      EditMessageHistoryDialog.show(requireParentFragment().getChildFragmentManager(), record.getToRecipient().getId(), record);
+      EditMessageHistoryDialog.show(getParentFragmentManager(), record.getToRecipient().getId(), record);
     } else {
-      EditMessageHistoryDialog.show(requireParentFragment().getChildFragmentManager(), record.getFromRecipient().getId(), record);
+      EditMessageHistoryDialog.show(getParentFragmentManager(), record.getFromRecipient().getId(), record);
     }
   }