diff --git a/src/ConversationVC.mm b/src/ConversationVC.mm
index 91be13d..23cf157 100644
--- a/src/ConversationVC.mm
+++ b/src/ConversationVC.mm
@@ -64,6 +64,9 @@
     __unsafe_unretained IBOutlet NSLayoutConstraint* sentContactRequestWidth;
     __unsafe_unretained IBOutlet NSButton* sentContactRequestButton;
     IBOutlet MessagesVC* messagesViewVC;
+
+    IBOutlet NSLayoutConstraint* titleHoverButtonConstraint;
+    IBOutlet NSLayoutConstraint* titleTopConstraint;
 }
 
 
@@ -119,11 +122,16 @@
                          }
 
                          BOOL isSMultipleCM = (contactMethods.length() > 1);
+                         BOOL hideCMPopupButton = !isSMultipleCM && (contactMethods.first()->bestId() == contactMethods.first()->bestName());
 
                          [contactMethodsPopupButton setEnabled:isSMultipleCM];
                          [contactMethodsPopupButton setBordered:isSMultipleCM];
+                         [contactMethodsPopupButton setHidden:hideCMPopupButton];
                          [[contactMethodsPopupButton cell] setArrowPosition: !isSMultipleCM ? NSPopUpNoArrow : NSPopUpArrowAtBottom];
 
+                         [titleHoverButtonConstraint setActive:hideCMPopupButton];
+                         [titleTopConstraint setActive:!hideCMPopupButton];
+
                          [emptyConversationPlaceHolder setHidden:NO];
                          // Select first cm
                          [contactMethodsPopupButton selectItemAtIndex:0];
@@ -260,12 +268,12 @@
 
     [self updateSendButtonVisibility];
 
-    [conversationTitle setStringValue:selectedContactMethod->primaryName().toNSString()];
+    [conversationTitle setStringValue:selectedContactMethod->bestName().toNSString()];
     QObject::disconnect(contactMethodChanged);
     contactMethodChanged = QObject::connect(selectedContactMethod,
                                             &ContactMethod::changed,
                                             [self] {
-                                                [conversationTitle setStringValue:selectedContactMethod->primaryName().toNSString()];
+                                                [conversationTitle setStringValue:selectedContactMethod->bestName().toNSString()];
                                                 [self updateSendButtonVisibility];
                                             });