diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index edfa0ff06..51d288234 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -628,6 +628,13 @@ void EmojiListWidget::applyNextSearchQuery() {
 		const auto modeChanged = (_searchMode != searching);
 		clearSelection();
 		if (modeChanged) {
+			if (_picker) {
+				_picker->hideAnimated();
+			}
+			_colorAllRipple = nullptr;
+			for (auto &set : _custom) {
+				set.ripple = nullptr;
+			}
 			_searchMode = searching;
 		}
 		if (!searching) {