diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 51d64ca353..6cca5b3ede 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4483,6 +4483,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_custom_emoji_count#one" = "{count} emoji";
 "lng_custom_emoji_count#other" = "{count} emoji";
 "lng_search_back_to_results" = "Back to search";
+"lng_search_results_header" = "Search Result";
 "lng_stickers_attached_sets" = "Sets of attached stickers";
 "lng_custom_emoji_used_sets" = "Sets of used emoji";
 "lng_custom_emoji_remove_pack_button" = "Remove Emoji";
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index c0367b4f37..a738c8368b 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1265,12 +1265,18 @@ int EmojiListWidget::searchShortcutsTop() const {
 }
 
 int EmojiListWidget::searchShortcutsHeight() const {
-	return searchShortcutsShown()
-		? ((searchShortcutSelected() ? st().searchBackHeight : 0)
-			+ st().searchPacksTop
-			+ st().searchPackHeight
-			+ st().searchPacksBottom)
-		: 0;
+	if (!searchShortcutsShown()) {
+		return 0;
+	}
+	auto result = st().searchPacksTop
+		+ st().searchPackHeight
+		+ st().searchPacksBottom;
+	if (searchShortcutSelected()) {
+		result += st().searchBackHeight;
+	} else {
+		result += st().header;
+	}
+	return result;
 }
 
 QRect EmojiListWidget::searchBackRect() const {
@@ -2106,6 +2112,20 @@ void EmojiListWidget::paintSearchShortcuts(Painter &p, QRect clip) {
 			titleWidth);
 	}
 	p.restore();
+
+	if (!searchShortcutSelected()) {
+		const auto top = searchShortcutsTop()
+			+ st().searchPacksTop
+			+ st().searchPackHeight
+			+ st().searchPacksBottom;
+		p.setFont(st::emojiPanHeaderFont);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().headerLeft - st().margin.left(),
+			top + st().headerTop,
+			width(),
+			tr::lng_search_results_header(tr::now));
+	}
 }
 
 void EmojiListWidget::paintSearchShortcutIcon(
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 8781fcfe7c..52f4a7b027 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -910,12 +910,18 @@ int StickersListWidget::searchShortcutsTop() const {
 }
 
 int StickersListWidget::searchShortcutsHeight() const {
-	return searchShortcutsShown()
-		? ((searchShortcutSelected() ? st().searchBackHeight : 0)
-			+ st().searchPacksTop
-			+ st().searchPackHeight
-			+ st().searchPacksBottom)
-		: 0;
+	if (!searchShortcutsShown()) {
+		return 0;
+	}
+	auto result = st().searchPacksTop
+		+ st().searchPackHeight
+		+ st().searchPacksBottom;
+	if (searchShortcutSelected()) {
+		result += st().searchBackHeight;
+	} else {
+		result += st().header;
+	}
+	return result;
 }
 
 QRect StickersListWidget::searchBackRect() const {
@@ -1389,6 +1395,20 @@ void StickersListWidget::paintSearchShortcuts(Painter &p, QRect clip) {
 			titleWidth);
 	}
 	p.restore();
+
+	if (!searchShortcutSelected()) {
+		const auto top = searchShortcutsTop()
+			+ st().searchPacksTop
+			+ st().searchPackHeight
+			+ st().searchPacksBottom;
+		p.setFont(st::emojiPanHeaderFont);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().headerLeft - st().margin.left(),
+			top + st().headerTop,
+			width(),
+			tr::lng_search_results_header(tr::now));
+	}
 }
 
 void StickersListWidget::paintSearchShortcutIcon(