diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index d0fcf575b..1259d2e29 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -672,6 +672,14 @@ class Message extends StatelessWidget {
                                                           scrollController:
                                                               scrollController,
                                                           child: Container(
+                                                            // #Pangea
+                                                            key: MatrixState
+                                                                .pAnyState
+                                                                .layerLinkAndKey(
+                                                                  event.eventId,
+                                                                )
+                                                                .key,
+                                                            // Pangea#
                                                             decoration:
                                                                 BoxDecoration(
                                                               borderRadius: