diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a2529078..ceb6a0dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,7 @@
 - Bugfix: Fixed automod and unban messages showing when moderation actions were disabled (#3548)
 - Bugfix: Fixed crash when rendering a highlight inside of a sub message, with sub message highlights themselves turned off. (#3556)
 - BugFix: Fixed SplitInput placeholder color. (#3606)
+- BugFix: Fixed double-clicking on usernames with right/middle click causing text selection. (#3608)
 - Dev: Batch checking live status for channels with live notifications that aren't connected. (#3442)
 - Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index b9b3bd8a1..c8c4e742b 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -2081,6 +2081,11 @@ void ChannelView::addHiddenContextMenuItems(
 }
 void ChannelView::mouseDoubleClickEvent(QMouseEvent *event)
 {
+    if (event->button() != Qt::LeftButton)
+    {
+        return;
+    }
+
     std::shared_ptr<MessageLayout> layout;
     QPoint relativePos;
     int messageIndex;