diff --git a/webui/src/components/GlobalSearch.tsx b/webui/src/components/GlobalSearch.tsx
index 1dbe325..dc648f1 100644
--- a/webui/src/components/GlobalSearch.tsx
+++ b/webui/src/components/GlobalSearch.tsx
@@ -10,7 +10,7 @@ import {
   type KeyboardEvent as ReactKeyboardEvent
 } from "react";
 import { useLocation } from "react-router";
-import {
+import { ActionToolbar,
   Button,
   Dialog,
   DocumentationHelpLink,
@@ -467,7 +467,7 @@ export default function GlobalSearch({ settings }: GlobalSearchProps) {
           <section
             className="search-overlay-results-panel"
             style={{ height: layout.resultsHeight }}>
-            <div className="search-overlay-toolbar">
+            <ActionToolbar className="search-overlay-toolbar">
               {currentContext &&
               <SegmentedControl<SearchScope>
                 className="search-overlay-scope"
@@ -598,7 +598,7 @@ export default function GlobalSearch({ settings }: GlobalSearchProps) {
                   )}
                 </div>
               }
-            </div>
+            </ActionToolbar>
 
             <PageScrollViewport
               id="global-search-overlay-results"
diff --git a/webui/src/features/search/SearchPage.tsx b/webui/src/features/search/SearchPage.tsx
index 88ef270..0b9203d 100644
--- a/webui/src/features/search/SearchPage.tsx
+++ b/webui/src/features/search/SearchPage.tsx
@@ -8,7 +8,7 @@ import {
   type FormEvent
 } from "react";
 import { useSearchParams } from "react-router";
-import {
+import { ActionToolbar,
   Button,
   DocumentationHelpLink,
   DismissibleAlert,
@@ -209,7 +209,7 @@ export default function SearchPage({ settings }: PlatformRouteContext) {
 
   return (
     <main className="search-page">
-      <div className="search-page-toolbar">
+      <ActionToolbar className="search-page-toolbar">
         <form className="search-page-form" onSubmit={submit}>
           <Search size={18} aria-hidden="true" />
           <input
@@ -324,7 +324,7 @@ export default function SearchPage({ settings }: PlatformRouteContext) {
             )}
           </div>
         }
-      </div>
+      </ActionToolbar>
       <PageScrollViewport className="search-results-viewport">
         {error &&
         <DismissibleAlert tone="danger" onDismiss={() => setError("")}>