From 68374409425d5032995849be5fefed89d55a5bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 6 Oct 2022 09:17:35 -0400
Subject: [PATCH] fix: showAndFocus to use a specific search form

---
 public/src/client/topic.js   |  5 +++--
 public/src/modules/search.js | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index b87e636728..e3c98e5a11 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -78,8 +78,9 @@ define('forum/topic', [
 				require(['search'], function (search) {
 					mousetrap.bind(['command+f', 'ctrl+f'], function (e) {
 						e.preventDefault();
-						$('[component="search/fields"] input[name="query"]').val('in:topic-' + ajaxify.data.tid + ' ');
-						search.showAndFocusInput();
+						const form = $('[component="navbar"] [component="search/form"]');
+						form.find('[component="search/fields"] input[name="query"]').val('in:topic-' + ajaxify.data.tid + ' ');
+						search.showAndFocusInput(form);
 					});
 
 					hooks.onPage('action:ajaxify.cleanup', () => {
diff --git a/public/src/modules/search.js b/public/src/modules/search.js
index 8b82ef1239..8e0a2d9302 100644
--- a/public/src/modules/search.js
+++ b/public/src/modules/search.js
@@ -63,7 +63,7 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
 			}
 			e.stopPropagation();
 
-			Search.showAndFocusInput();
+			Search.showAndFocusInput(searchForm);
 			return false;
 		});
 
@@ -221,10 +221,10 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
 		});
 	};
 
-	Search.showAndFocusInput = function () {
-		$('[component="search/fields"]').removeClass('hidden');
-		$('[component="search/button"]').addClass('hidden');
-		$('[component="search/fields"] input[name="query"]').trigger('focus');
+	Search.showAndFocusInput = function (form) {
+		form.find('[component="search/fields"]').removeClass('hidden');
+		form.find('[component="search/button"]').addClass('hidden');
+		form.find('[component="search/fields"] input[name="query"]').trigger('focus');
 	};
 
 	Search.query = function (data, callback) {