diff --git a/src/components/common/PeerChip.module.scss b/src/components/common/PeerChip.module.scss
index 3d8aa4bc8..e6e2e6604 100644
--- a/src/components/common/PeerChip.module.scss
+++ b/src/components/common/PeerChip.module.scss
@@ -5,7 +5,7 @@
   height: 2rem;
   min-width: 2rem;
   margin-inline: 0.25rem;
-  padding-right: 1rem;
+  padding-right: 0.75rem;
   border-radius: 1rem;
   cursor: var(--custom-cursor, pointer);
   position: relative;
@@ -13,8 +13,6 @@
   flex-shrink: 1;
   transition: background-color 0.15s ease;
 
-  max-width: calc(50% - 0.5rem);
-
   &.minimized {
     padding-right: 0;
   }
@@ -41,10 +39,6 @@
     }
   }
 
-  &.fluid {
-    max-width: unset;
-  }
-
   &.notClickable {
     cursor: default;
   }
diff --git a/src/components/common/PeerChip.tsx b/src/components/common/PeerChip.tsx
index 2fb9e8efe..86e7317df 100644
--- a/src/components/common/PeerChip.tsx
+++ b/src/components/common/PeerChip.tsx
@@ -33,7 +33,6 @@ type OwnProps<T = undefined> = {
   canClose?: boolean;
   isCloseNonDestructive?: boolean;
   className?: string;
-  fluid?: boolean;
   withPeerColors?: boolean;
   withEmojiStatus?: boolean;
   clickArg?: T;
@@ -58,7 +57,6 @@ const PeerChip = <T,>({
   mockPeer,
   customPeer,
   className,
-  fluid,
   isSavedMessages,
   withPeerColors,
   withEmojiStatus,
@@ -106,7 +104,6 @@ const PeerChip = <T,>({
     isMinimized && styles.minimized,
     canClose && styles.closeable,
     isCloseNonDestructive && styles.nonDestructive,
-    fluid && styles.fluid,
     !onClick && styles.notClickable,
     withPeerColors && getPeerColorClass(customPeer || peer),
     className,
diff --git a/src/components/common/pickers/PickerStyles.module.scss b/src/components/common/pickers/PickerStyles.module.scss
index 464e2cc6f..ecb059420 100644
--- a/src/components/common/pickers/PickerStyles.module.scss
+++ b/src/components/common/pickers/PickerStyles.module.scss
@@ -45,6 +45,7 @@
 
 .peerChip {
   margin-bottom: 0.5rem;
+  max-width: calc(50% - 0.5rem);
 }
 
 .pickerList {
diff --git a/src/components/left/main/LeftMainHeader.tsx b/src/components/left/main/LeftMainHeader.tsx
index ab9671e82..bf616476f 100644
--- a/src/components/left/main/LeftMainHeader.tsx
+++ b/src/components/left/main/LeftMainHeader.tsx
@@ -226,7 +226,6 @@ const LeftMainHeader: FC<OwnProps & StateProps> = ({
           <PeerChip
             icon="calendar"
             title={selectedSearchDate}
-            fluid
             canClose
             isMinimized={Boolean(globalSearchChatId)}
             className="left-search-picker-item"
@@ -240,7 +239,6 @@ const LeftMainHeader: FC<OwnProps & StateProps> = ({
             className="left-search-picker-item"
             peerId={globalSearchChatId}
             onClick={setGlobalSearchChatId}
-            fluid
             canClose
             isMinimized
             clickArg={CLEAR_CHAT_SEARCH_PARAM}
diff --git a/src/components/middle/message/Giveaway.tsx b/src/components/middle/message/Giveaway.tsx
index 91e1e09e7..c2f539eb0 100644
--- a/src/components/middle/message/Giveaway.tsx
+++ b/src/components/middle/message/Giveaway.tsx
@@ -163,7 +163,6 @@ const Giveaway = ({
               <PeerChip
                 peerId={peerId}
                 forceShowSelf
-                fluid
                 withPeerColors={!isOwn}
                 className={styles.peer}
                 clickArg={peerId}
@@ -206,7 +205,6 @@ const Giveaway = ({
               <PeerChip
                 peerId={peerId}
                 forceShowSelf
-                fluid
                 withPeerColors={!isOwn}
                 className={styles.peer}
                 clickArg={peerId}
diff --git a/src/components/middle/search/MiddleSearch.tsx b/src/components/middle/search/MiddleSearch.tsx
index 399bbb53b..42ac81900 100644
--- a/src/components/middle/search/MiddleSearch.tsx
+++ b/src/components/middle/search/MiddleSearch.tsx
@@ -521,7 +521,6 @@ const MiddleSearch: FC<StateProps> = ({
         return (
           <PeerChip
             className={buildClassName(styles.searchType, isSelected && styles.selectedType)}
-            fluid
             peerId={chat?.id}
             title={oldLang('SearchThisChat')}
             clickArg="chat"
@@ -532,7 +531,6 @@ const MiddleSearch: FC<StateProps> = ({
         return (
           <PeerChip
             className={buildClassName(styles.searchType, isSelected && styles.selectedType)}
-            fluid
             peerId={currentUserId}
             forceShowSelf
             title={oldLang('SearchMyMessages')}
@@ -544,7 +542,6 @@ const MiddleSearch: FC<StateProps> = ({
         return (
           <PeerChip
             className={buildClassName(styles.searchType, isSelected && styles.selectedType)}
-            fluid
             customPeer={CHANNELS_PEER}
             title={oldLang('SearchPublicPosts')}
             clickArg="channels"
diff --git a/src/components/modals/collectible/CollectibleInfoModal.tsx b/src/components/modals/collectible/CollectibleInfoModal.tsx
index 00798be78..7b7c1dd37 100644
--- a/src/components/modals/collectible/CollectibleInfoModal.tsx
+++ b/src/components/modals/collectible/CollectibleInfoModal.tsx
@@ -124,7 +124,6 @@ const CollectibleInfoModal: FC<OwnProps & StateProps> = ({
         {title && renderText(title, ['simple_markdown'])}
       </h3>
       <PeerChip
-        fluid
         className={styles.chip}
         peerId={modal?.peerId}
         forceShowSelf
diff --git a/src/components/modals/common/TableInfoModal.tsx b/src/components/modals/common/TableInfoModal.tsx
index 343839b90..c35fbeea7 100644
--- a/src/components/modals/common/TableInfoModal.tsx
+++ b/src/components/modals/common/TableInfoModal.tsx
@@ -78,7 +78,6 @@ const TableInfoModal = ({
                   peerId={value.chatId}
                   className={styles.chatItem}
                   forceShowSelf
-                  fluid
                   withEmojiStatus={value.withEmojiStatus}
                   clickArg={value.chatId}
                   onClick={handleOpenChat}