diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
index c938a9307..a4b43cc71 100644
--- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
@@ -339,8 +339,12 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
     double boxHeight =
         screenHeight - _originalMessageOffset.dy - originalContentHeight;
 
-    if (boxHeight + _fullContentHeight > screenHeight) {
-      boxHeight = screenHeight - _fullContentHeight - 8.0;
+    final neededSpace =
+        boxHeight + _fullContentHeight + mediaQuery!.padding.top;
+
+    if (neededSpace > screenHeight) {
+      boxHeight =
+          screenHeight - _fullContentHeight - mediaQuery!.padding.top - 4.0;
     }
 
     return boxHeight;