diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 338276c45..f45b43a8e 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -45,6 +45,7 @@ EmojiPan {
 	bg: color;
 	overBg: color;
 	categoriesBg: color;
+	categoriesBgOver: color;
 	fadeLeft: icon;
 	fadeRight: icon;
 	search: TabbedSearch;
@@ -261,6 +262,7 @@ defaultEmojiPan: EmojiPan {
 	bg: emojiPanBg;
 	overBg: emojiPanHover;
 	categoriesBg: emojiPanCategories;
+	categoriesBgOver: windowBgRipple;
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
 	fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
 	search: defaultTabbedSearch;
@@ -268,6 +270,7 @@ defaultEmojiPan: EmojiPan {
 }
 statusEmojiPan: EmojiPan(defaultEmojiPan) {
 	categoriesBg: windowBg;
+	categoriesBgOver: windowBgOver;
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", windowBg }};
 	fadeRight: icon {{ "fade_horizontal", windowBg }};
 }
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 38ee14b69..56ff0c35b 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -176,9 +176,7 @@ object_ptr<TabbedSelector::InnerFooter> GifsListWidget::createFooter() {
 		const auto i = ranges::find(_sections, setId, [](GifSection value) {
 			return value.document->id;
 		});
-		if (i != end(_sections)) {
-			searchForGifs(i->emoji->text());
-		}
+		searchForGifs((i != end(_sections)) ? i->emoji->text() : QString());
 	}, _footer->lifetime());
 
 	return result;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 26646b1e0..bb4879510 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -295,8 +295,8 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
 , _settingsButtonVisible(descriptor.settingsButtonVisible)
 , _iconState([=] { update(); })
 , _subiconState([=] { update(); })
-, _selectionBg(st::emojiPanRadius, st::windowBgRipple)
-, _subselectionBg(st().iconArea / 2, st::windowBgRipple) {
+, _selectionBg(st::emojiPanRadius, st().categoriesBgOver)
+, _subselectionBg(st().iconArea / 2, st().categoriesBgOver) {
 	setMouseTracking(true);
 
 	_iconsLeft = st().iconSkip
@@ -679,7 +679,7 @@ void StickersListFooter::paintSelectionBg(
 			area / 2,
 			progress);
 		p.setPen(Qt::NoPen);
-		p.setBrush(st::windowBgRipple);
+		p.setBrush(st().categoriesBgOver);
 		p.drawRoundedRect(rect, radius, radius);
 	}
 }