diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
index 461d03018..3ff78523e 100644
--- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
@@ -264,14 +264,15 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
   double get _contentHeight {
     final messageHeight =
         _overlayMessageSize?.height ?? originalMessageSize.height;
-    return messageHeight + reactionsHeight + AppConfig.toolbarMenuHeight + 4.0;
+    return messageHeight + reactionsHeight + AppConfig.toolbarMenuHeight + 8.0;
   }
 
   double get _overheadContentHeight {
-    return widget.pangeaMessageEvent != null &&
-            widget.overlayController.selectedToken != null
-        ? AppConfig.toolbarMaxHeight
-        : 40.0;
+    return (widget.pangeaMessageEvent != null &&
+                widget.overlayController.selectedToken != null
+            ? AppConfig.toolbarMaxHeight
+            : 40.0) +
+        4.0;
   }
 
   double? get _wordCardLeftOffset {
diff --git a/lib/pangea/toolbar/widgets/over_message_overlay.dart b/lib/pangea/toolbar/widgets/over_message_overlay.dart
index 38e5b750c..f500d4e6c 100644
--- a/lib/pangea/toolbar/widgets/over_message_overlay.dart
+++ b/lib/pangea/toolbar/widgets/over_message_overlay.dart
@@ -40,8 +40,10 @@ class OverMessageOverlay extends StatelessWidget {
                       controller.columnWidth -
                       (controller.showDetails ? FluffyThemes.columnWidth : 0),
                 ),
-                if (!controller.shouldScroll)
+                if (!controller.shouldScroll) ...[
                   WordCardSwitcher(controller: controller),
+                  const SizedBox(height: 4.0),
+                ],
                 CompositedTransformTarget(
                   link: MatrixState.pAnyState
                       .layerLinkAndKey(