diff --git a/src/components/common/ChatExtra.tsx b/src/components/common/ChatExtra.tsx
index 5f6aa98a6..1077728f4 100644
--- a/src/components/common/ChatExtra.tsx
+++ b/src/components/common/ChatExtra.tsx
@@ -128,7 +128,7 @@ const ChatExtra: FC<OwnProps & StateProps> = ({
                       stopEvent(e);
                       copy(`@${nick}`, lang(isChat ? 'Link' : 'Username'));
                     }}
-                    className="username-link"
+                    className="text-entity-link username-link"
                   >
                     {`@${nick}`}
                   </a>
diff --git a/src/components/left/settings/Settings.scss b/src/components/left/settings/Settings.scss
index e56c740f9..c505fd9eb 100644
--- a/src/components/left/settings/Settings.scss
+++ b/src/components/left/settings/Settings.scss
@@ -344,10 +344,6 @@
   padding: 0 1.5rem;
 }
 
-.username-link {
-  color: var(--color-links);
-}
-
 .settings-quick-reaction {
   .Radio-main .label {
     display: flex;
diff --git a/src/components/ui/ListItem.scss b/src/components/ui/ListItem.scss
index 3ac10338a..e9e17d1b0 100644
--- a/src/components/ui/ListItem.scss
+++ b/src/components/ui/ListItem.scss
@@ -57,6 +57,8 @@
 
   .other-usernames {
     display: block;
+    white-space: normal;
+    line-height: 1.25rem;
   }
 
   .username-link {