diff --git a/src/components/common/GroupChatInfo.tsx b/src/components/common/GroupChatInfo.tsx
index 0f36cbdd4..32bcf0f70 100644
--- a/src/components/common/GroupChatInfo.tsx
+++ b/src/components/common/GroupChatInfo.tsx
@@ -170,7 +170,7 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
 
     return (
       <span className="status">
-        {mainUsername && <span className="handle">{mainUsername}</span>}
+        {mainUsername && <span className="handle withStatus">{mainUsername}</span>}
         <span className="group-status">{groupStatus}</span>
         {onlineStatus && <span className="online-status">{onlineStatus}</span>}
       </span>
diff --git a/src/components/common/PrivateChatInfo.tsx b/src/components/common/PrivateChatInfo.tsx
index a57151c2e..7cf0ff191 100644
--- a/src/components/common/PrivateChatInfo.tsx
+++ b/src/components/common/PrivateChatInfo.tsx
@@ -142,10 +142,12 @@ const PrivateChatInfo: FC<OwnProps & StateProps> = ({
       return <TypingStatus typingStatus={typingStatus} />;
     }
 
+    const translatedStatus = getUserStatus(lang, user, userStatus);
+    const mainUserNameClassName = buildClassName('handle', translatedStatus && 'withStatus');
     return (
       <span className={buildClassName('status', isUserOnline(user, userStatus) && 'online')}>
-        {mainUsername && <span className="handle">{mainUsername}</span>}
-        <span className="user-status" dir="auto">{getUserStatus(lang, user, userStatus)}</span>
+        {mainUsername && <span className={mainUserNameClassName}>{mainUsername}</span>}
+        {translatedStatus && <span className="user-status" dir="auto">{translatedStatus}</span>}
       </span>
     );
   }
diff --git a/src/components/left/search/LeftSearch.scss b/src/components/left/search/LeftSearch.scss
index c18c26106..4681a1e15 100644
--- a/src/components/left/search/LeftSearch.scss
+++ b/src/components/left/search/LeftSearch.scss
@@ -133,7 +133,7 @@
           }
         }
 
-        &::after {
+        &.withStatus::after {
           content: ", ";
           color: var(--color-text-secondary);