From 5975f0948221a1fbfda2c4e350adeb35dfce9935 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Mon, 5 Oct 2026 09:31:59 +0000
Subject: [PATCH] Redesign: Fix search issues (#40856)

---
 .../mastodon/features/compose/components/search.tsx      | 3 ++-
 app/javascript/mastodon/features/search/index.tsx        | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/search.tsx b/app/javascript/mastodon/features/compose/components/search.tsx
index 6730e111645..bf476da4bf7 100644
--- a/app/javascript/mastodon/features/compose/components/search.tsx
+++ b/app/javascript/mastodon/features/compose/components/search.tsx
@@ -111,7 +111,8 @@ export const Search: React.FC<{
   const [expanded, setExpanded] = useState(false);
   const [selectedOption, setSelectedOption] = useState(-1);
   const [quickActions, setQuickActions] = useState<SearchOption[]>([]);
-  const [shouldOpenOnFocus, setShouldOpenOnFocus] = useState(false);
+  const [shouldOpenOnFocus, setShouldOpenOnFocus] =
+    useState(!isRedesignEnabled());
   const focusAfterNavigation = useFocusAfterNavigation(
     FOCUS_TARGET.SEARCH,
     () => {
diff --git a/app/javascript/mastodon/features/search/index.tsx b/app/javascript/mastodon/features/search/index.tsx
index 3811b971f76..5ed34d3df95 100644
--- a/app/javascript/mastodon/features/search/index.tsx
+++ b/app/javascript/mastodon/features/search/index.tsx
@@ -314,7 +314,14 @@ export const SearchResults: React.FC<{ multiColumn: boolean }> = ({
         />
       )}
 
-      <div className='explore__search-results' data-nosnippet>
+      <div
+        className={
+          isRedesignEnabled()
+            ? 'scrollable scrollable--flex'
+            : 'explore__search-results'
+        }
+        data-nosnippet
+      >
         <ScrollableList
           scrollKey='search-results'
           isLoading={isLoading}