diff --git a/CHANGES b/CHANGES
index e4ec299ca..0682ad1ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -123,6 +123,7 @@ Bugs fixed
 * Generated Makefiles lack a final EOL (refs: #6232)
 * #6375: extlinks: Cannot escape angle brackets in link caption
 * #6378: linkcheck: Send commonly used User-Agent
+* #6387: html search: failed to search document with haiku and scrolls themes
 
 Testing
 --------
diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html
index 9dbae6d0a..2f1a0b4a0 100644
--- a/sphinx/themes/haiku/layout.html
+++ b/sphinx/themes/haiku/layout.html
@@ -51,7 +51,7 @@
       <div class="topnav" role="navigation" aria-label="top navigation">
       {{ nav() }}
       </div>
-      <div class="content">
+      <div class="content" role="main">
         {#{%- if display_toc %}
         <div id="toc">
           <h3>{{ _('Table of Contents') }}</h3>
diff --git a/sphinx/themes/scrolls/layout.html b/sphinx/themes/scrolls/layout.html
index 852ac967f..08f8970fc 100644
--- a/sphinx/themes/scrolls/layout.html
+++ b/sphinx/themes/scrolls/layout.html
@@ -42,7 +42,9 @@
           {{ toc }}
         </div>
         {%- endif %}
+        <div role="main">
         {% block body %}{% endblock %}
+        </div>
       </div>
     </div>
 {% endblock %}