From c80ca730c7e2cb7192dd9ab12e19b3b68806572b Mon Sep 17 00:00:00 2001
From: "Julia.Radzhabova" <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 28 Nov 2025 21:45:08 +0300
Subject: [PATCH] Fix highlighting search results when search bar is visible

---
 apps/documenteditor/main/app/controller/Search.js    | 2 +-
 apps/pdfeditor/main/app/controller/Search.js         | 2 +-
 apps/spreadsheeteditor/main/app/controller/Search.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index f86aba2d5e..5b1e04a3a9 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -463,7 +463,7 @@ define([
         },
 
         onSelectSearchingResults: function (val) {
-            if (!val && this.getApplication().getController('LeftMenu').isSearchPanelVisible()) return;
+            if (!val && (this.getApplication().getController('LeftMenu').isSearchPanelVisible() || this.getApplication().getController('Viewport').isSearchBarVisible())) return;
 
             if (this._state.isHighlightedResults !== val) {
                 this.api.asc_selectSearchingResults(val);
diff --git a/apps/pdfeditor/main/app/controller/Search.js b/apps/pdfeditor/main/app/controller/Search.js
index 628a2cab65..269972ed8e 100644
--- a/apps/pdfeditor/main/app/controller/Search.js
+++ b/apps/pdfeditor/main/app/controller/Search.js
@@ -487,7 +487,7 @@ define([
         },
 
         onSelectSearchingResults: function (val) {
-            if (!val && this.getApplication().getController('LeftMenu').isSearchPanelVisible()) return;
+            if (!val && (this.getApplication().getController('LeftMenu').isSearchPanelVisible() || this.getApplication().getController('Viewport').isSearchBarVisible())) return;
 
             if (this._state.isHighlightedResults !== val) {
                 this.api.asc_selectSearchingResults(val);
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 8fa5a6e293..c4f2150563 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -599,7 +599,7 @@ define([
         },
 
         onSelectSearchingResults: function (val) {
-            if (!val && this.getApplication().getController('LeftMenu').isSearchPanelVisible()) return;
+            if (!val && (this.getApplication().getController('LeftMenu').isSearchPanelVisible() || this.getApplication().getController('Viewport').isSearchBarVisible())) return;
 
             if (this._state.isHighlightedResults !== val) {
                 this.api.asc_selectSearchingResults(val);