From 27c96ca30851f2b32fbcd38e36ceb7bda3dcf816 Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Fri, 8 May 2026 16:40:30 +0200
Subject: [PATCH] Make header region sticky on search results page

---
 .../mastodon/features/search/index.tsx        | 98 ++++++++++---------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/app/javascript/mastodon/features/search/index.tsx b/app/javascript/mastodon/features/search/index.tsx
index 0424ed30c39..724d9c16d61 100644
--- a/app/javascript/mastodon/features/search/index.tsx
+++ b/app/javascript/mastodon/features/search/index.tsx
@@ -222,52 +222,62 @@ export const SearchResults: React.FC<{ multiColumn: boolean }> = ({
         title={intl.formatMessage(messages.title, { q })}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}
+        appendContent={
+          <>
+            <div className='explore__search-header'>
+              <Search
+                singleColumn
+                initialValue={trimmedValue}
+                key={trimmedValue}
+              />
+            </div>
+
+            <div className='account__section-headline'>
+              <button
+                onClick={handleSelectAll}
+                className={mappedType === 'all' ? 'active' : undefined}
+                type='button'
+              >
+                <FormattedMessage
+                  id='search_results.all'
+                  defaultMessage='All'
+                />
+              </button>
+              <button
+                onClick={handleSelectAccounts}
+                className={mappedType === 'accounts' ? 'active' : undefined}
+                type='button'
+              >
+                <FormattedMessage
+                  id='search_results.accounts'
+                  defaultMessage='Profiles'
+                />
+              </button>
+              <button
+                onClick={handleSelectHashtags}
+                className={mappedType === 'hashtags' ? 'active' : undefined}
+                type='button'
+              >
+                <FormattedMessage
+                  id='search_results.hashtags'
+                  defaultMessage='Hashtags'
+                />
+              </button>
+              <button
+                onClick={handleSelectStatuses}
+                className={mappedType === 'statuses' ? 'active' : undefined}
+                type='button'
+              >
+                <FormattedMessage
+                  id='search_results.statuses'
+                  defaultMessage='Posts'
+                />
+              </button>
+            </div>
+          </>
+        }
       />
 
-      <div className='explore__search-header'>
-        <Search singleColumn initialValue={trimmedValue} key={trimmedValue} />
-      </div>
-
-      <div className='account__section-headline'>
-        <button
-          onClick={handleSelectAll}
-          className={mappedType === 'all' ? 'active' : undefined}
-          type='button'
-        >
-          <FormattedMessage id='search_results.all' defaultMessage='All' />
-        </button>
-        <button
-          onClick={handleSelectAccounts}
-          className={mappedType === 'accounts' ? 'active' : undefined}
-          type='button'
-        >
-          <FormattedMessage
-            id='search_results.accounts'
-            defaultMessage='Profiles'
-          />
-        </button>
-        <button
-          onClick={handleSelectHashtags}
-          className={mappedType === 'hashtags' ? 'active' : undefined}
-          type='button'
-        >
-          <FormattedMessage
-            id='search_results.hashtags'
-            defaultMessage='Hashtags'
-          />
-        </button>
-        <button
-          onClick={handleSelectStatuses}
-          className={mappedType === 'statuses' ? 'active' : undefined}
-          type='button'
-        >
-          <FormattedMessage
-            id='search_results.statuses'
-            defaultMessage='Posts'
-          />
-        </button>
-      </div>
-
       <div className='explore__search-results' data-nosnippet>
         <ScrollableList
           scrollKey='search-results'