diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
index 817fec867f..ce4fe06b48 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
@@ -1652,7 +1652,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 
                 let filteredPeer: (EnginePeer, EnginePeer) -> Bool = { peer, accountPeer in
                     if let peerType = requestPeerType {
-                        guard !peer.isDeleted else {
+                        guard !peer.isDeleted && peer.id != context.account.peerId else {
                             return false
                         }
                         switch peerType {
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
index 19cfa5abe3..b896f7b468 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -1744,7 +1744,7 @@ public final class ChatListNode: ListView {
                         isEmpty = false
                         return true
                     case let .peerType(peerType):
-                        if let peer = peer.peer, !peer.isDeleted {
+                        if let peer = peer.peer, !peer.isDeleted && peer.id != context.account.peerId {
                             switch peerType {
                             case let .user(userType):
                                 if case let .user(user) = peer {
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiSearchContent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiSearchContent.swift
index 59f7560b3d..2c3483b3ca 100644
--- a/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiSearchContent.swift
+++ b/submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiSearchContent.swift
@@ -336,6 +336,7 @@ public final class EmojiSearchContent: ASDisplayNode, EntitySearchContainerNode
                 }
                 self.onCancel?()
             },
+            onScroll: {},
             chatPeerId: nil,
             peekBehavior: nil,
             customLayout: nil,