diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp index cc4463594..9e98ae7c7 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp @@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "ui/widgets/scroll_area.h" #include "ui/painter.h" +#include "ui/ui_utility.h" #include "window/window_session_controller.h" #include "styles/style_boxes.h" #include "styles/style_chat.h" @@ -389,7 +390,9 @@ rpl::producer> TopBar::keyEvents() const { } void TopBar::setInnerFocus() { - _select->setInnerFocus(); + if (Ui::InFocusChain(_select)) { + _select->setInnerFocus(); + } } void TopBar::updateSize() { @@ -1032,7 +1035,9 @@ ComposeSearch::Inner::Inner( } void ComposeSearch::Inner::setInnerFocus() { - _topBar->setInnerFocus(); + if (Ui::InFocusChain(_topBar)) { + _topBar->setInnerFocus(); + } } void ComposeSearch::Inner::setQuery(const QString &query) {