From 080ecece6694f6b8be848baae6891dec87eb48f6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 5 Nov 2025 17:56:27 +0300
Subject: [PATCH] Improved focus widgets within chat when foreground box is
 presented.

---
 Telegram/SourceFiles/history/history_widget.cpp                | 3 +++
 .../SourceFiles/history/view/history_view_chat_section.cpp     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2b0d4c610f..562ad5943a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2045,6 +2045,9 @@ void HistoryWidget::activate() {
 }
 
 void HistoryWidget::setInnerFocus() {
+	if (!Ui::InFocusChain(this)) {
+		return;
+	}
 	if (_list) {
 		if (isSearching() && !_nonEmptySelection) {
 			_composeSearch->setInnerFocus();
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index 2ba956f3f9..ba2073dc3c 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -2390,6 +2390,9 @@ void ChatWidget::checkActivation() {
 }
 
 void ChatWidget::doSetInnerFocus() {
+	if (!Ui::InFocusChain(this)) {
+		return;
+	}
 	if (_composeSearch
 		&& _inner->getSelectedText().rich.text.isEmpty()
 		&& _inner->getSelectedItems().empty()) {