diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index d62b831dc..0e1a5375d 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -44,7 +44,7 @@
               <Popover
                 trigger="click"
                 placement="top"
-                :bound-to-selector="isCurrentUser ? '' : '.scrollable-message-list'"
+                bound-to-selector=".chat-view-inner"
                 :bound-to="{ x: 'container' }"
                 :margin="popoverMarginStyle"
                 @show="menuOpened = true"
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 7d1ad1d6b..c65689bd1 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -129,9 +129,12 @@ const Popover = {
         opacity: 1,
         left: `${Math.round(origin.x + translateX)}px`,
         top: `${Math.round(origin.y + translateY)}px`,
-        maxWidth: `${parentScreenBox ? Math.round(parentScreenBox.width) : 0}px`,
         position: 'fixed'
       }
+
+      if (parentScreenBox) {
+        this.styles.maxWidth = `${Math.round(parentScreenBox.width)}px`
+      }
     },
     showPopover () {
       const wasHidden = this.hidden