diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 6147a66df..a5e60687d 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -205,7 +205,12 @@ class Message extends StatelessWidget {
                       right: 0,
                       child: InkWell(
                         // #Pangea
-                        onTap: controller.clearSelectedEvents,
+                        onTap: () => overlayController == null
+                            ? showToolbar(pangeaMessageEvent)
+                            : controller.clearSelectedEvents(),
+                        onLongPress: () => overlayController == null
+                            ? showToolbar(pangeaMessageEvent)
+                            : controller.clearSelectedEvents(),
                         // onTap: () => onSelect(event),
                         // onLongPress: () => onSelect(event),
                         // Pangea#
diff --git a/lib/pangea/widgets/chat/message_selection_overlay.dart b/lib/pangea/widgets/chat/message_selection_overlay.dart
index 496c7ce66..5e9cb3fe9 100644
--- a/lib/pangea/widgets/chat/message_selection_overlay.dart
+++ b/lib/pangea/widgets/chat/message_selection_overlay.dart
@@ -361,6 +361,7 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
               prevEvent: widget._prevEvent,
               timeline: widget.chatController.timeline!,
               messageWidth: messageSize!.width,
+              messageHeight: messageSize!.height,
             ),
             ToolbarButtons(
               overlayController: this,
diff --git a/lib/pangea/widgets/chat/overlay_message.dart b/lib/pangea/widgets/chat/overlay_message.dart
index 07f83c8b5..9372edbfb 100644
--- a/lib/pangea/widgets/chat/overlay_message.dart
+++ b/lib/pangea/widgets/chat/overlay_message.dart
@@ -17,6 +17,7 @@ class OverlayMessage extends StatelessWidget {
   final Timeline timeline;
   final bool immersionMode;
   final double messageWidth;
+  final double messageHeight;
 
   const OverlayMessage(
     this.pangeaMessageEvent, {
@@ -25,6 +26,7 @@ class OverlayMessage extends StatelessWidget {
     required this.controller,
     required this.timeline,
     required this.messageWidth,
+    required this.messageHeight,
     this.nextEvent,
     this.prevEvent,
     super.key,
@@ -97,6 +99,7 @@ class OverlayMessage extends StatelessWidget {
           vertical: 8,
         ),
         width: messageWidth,
+        height: messageHeight,
         child: MessageContent(
           pangeaMessageEvent.event,
           textColor: ownMessage