diff --git a/Telegram-Mac/ChatInterfaceStateContextQueries.swift b/Telegram-Mac/ChatInterfaceStateContextQueries.swift
index 760a766cba..e094fea7d9 100644
--- a/Telegram-Mac/ChatInterfaceStateContextQueries.swift
+++ b/Telegram-Mac/ChatInterfaceStateContextQueries.swift
@@ -91,7 +91,7 @@ private func makeInlineResult(_ inputQuery: ChatPresentationInputQuery, chatPres
                 case .installed:
                     scope = [.installed]
                 }
-            return context.engine.stickers.searchStickers(query: query, emoticon: [], scope: scope) |> map { $0.items }
+            return context.engine.stickers.searchStickers(query: nil, emoticon: [query.basicEmoji.0], scope: scope) |> map { $0.items }
         }
         |> map { stickers -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
             return { _ in
diff --git a/Telegram-Mac/StickersViewController.swift b/Telegram-Mac/StickersViewController.swift
index 3ecbb5cf70..4dfad4e8e6 100644
--- a/Telegram-Mac/StickersViewController.swift
+++ b/Telegram-Mac/StickersViewController.swift
@@ -1533,7 +1533,7 @@ class NStickersViewController: TelegramGenericViewController<NStickersView>, Tab
                 
                 let emojiRelated: Signal<[FoundStickerItem], NoError> = combineLatest(context.sharedContext.inputSource.searchEmoji(postbox: context.account.postbox, engine: context.engine, sharedContext: context.sharedContext, query: searchText, completeMatch: true, checkPrediction: false), input) |> mapToSignal { emojis, input in
                     
-                    return context.engine.stickers.searchStickers(query: searchText, emoticon: [], inputLanguageCode: input) |> map { $0.0 }
+                    return context.engine.stickers.searchStickers(query: searchText, emoticon: emojis, inputLanguageCode: input) |> map { $0.0 }
 //                    return combineLatest(signals) |> map {
 //                        $0.reduce([], { current, value in
 //                            return current + value.0