diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index c43d26298..3e556a056 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -625,6 +625,15 @@ void ComposeControls::init() {
 			cancelEditMessage();
 		}, _wrap->lifetime());
 	}
+
+	HoverEmojiPanelChanges(
+	) | rpl::start_with_next([=] {
+		if (_window->hasTabbedSelectorOwnership()) {
+			createTabbedPanel();
+		} else {
+			setTabbedPanel(nullptr);
+		}
+	}, _wrap->lifetime());
 }
 
 void ComposeControls::setTextFromEditingMessage(not_null<HistoryItem*> item) {
@@ -822,7 +831,9 @@ void ComposeControls::setTabbedPanel(
 		std::unique_ptr<ChatHelpers::TabbedPanel> panel) {
 	_tabbedPanel = std::move(panel);
 	if (const auto raw = _tabbedPanel.get()) {
-		_tabbedSelectorToggle->installEventFilter(raw);
+		if (HoverEmojiPanel()) {
+			_tabbedSelectorToggle->installEventFilter(raw);
+		}
 		_tabbedSelectorToggle->setColorOverrides(nullptr, nullptr, nullptr);
 	} else {
 		_tabbedSelectorToggle->setColorOverrides(