diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 869f26e60c..0966c279c4 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -351,6 +351,16 @@ export class Message extends React.Component<Props, State> {
     }
   };
 
+  public showMenuIfNoSelection = (
+    event: React.MouseEvent<HTMLDivElement>
+  ): void => {
+    const selection = window.getSelection();
+    if (selection && !selection.isCollapsed) {
+      return;
+    }
+    this.showMenu(event);
+  };
+
   public handleImageError = (): void => {
     const { id } = this.props;
     window.log.info(
@@ -2317,7 +2327,11 @@ export class Message extends React.Component<Props, State> {
 
     return (
       <div className="module-message__container-outer">
-        <div className={containerClassnames} style={containerStyles}>
+        <div
+          className={containerClassnames}
+          style={containerStyles}
+          onContextMenu={this.showMenuIfNoSelection}
+        >
           {this.renderAuthor()}
           {this.renderContents()}
         </div>