diff --git a/Makefile b/Makefile
index 4ec6084b1d1..ce24e2cd6b8 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ ALLSPHINXOPTS = --builder $(BUILDER) \
 .PHONY: html
 html: venv
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
+	$(VENVDIR)/bin/python3 -m pagefind --site $(BUILDDIR) --verbose
 
 ## htmlview       to open the index page built by the html target in your browser
 .PHONY: htmlview
diff --git a/pep_sphinx_extensions/pep_theme/static/mq.css b/pep_sphinx_extensions/pep_theme/static/mq.css
index 2609a959ebd..5653f66a555 100644
--- a/pep_sphinx_extensions/pep_theme/static/mq.css
+++ b/pep_sphinx_extensions/pep_theme/static/mq.css
@@ -17,6 +17,10 @@
     nav#pep-sidebar {
         display: none;
     }
+    /* Show mobile search container on small screens */
+    .mobile-search-container {
+        display: block;
+    }
     pre {
         font-size: 0.8175rem;
     }
@@ -46,6 +50,10 @@
         float: left;
         margin-right: 2%;
     }
+    /* Hide mobile search container on larger screens */
+    .mobile-search-container {
+        display: none;
+    }
   /* Make less prominent when sidebar ToC is available */
   details > summary {
       font-size: 1rem;
diff --git a/pep_sphinx_extensions/pep_theme/static/style.css b/pep_sphinx_extensions/pep_theme/static/style.css
index 37323c27794..edbe8e38c05 100644
--- a/pep_sphinx_extensions/pep_theme/static/style.css
+++ b/pep_sphinx_extensions/pep_theme/static/style.css
@@ -427,6 +427,10 @@ dl.footnote > dd {
     padding-bottom: 2rem;
     font-weight: bold;
 }
+/* Pagefind search results */
+#pep-sidebar ol.pagefind-ui__results {
+  padding-left: .5rem;
+}
 
 .reference.external > strong {
     font-weight: normal;  /* Fix strong links for :pep: and :rfc: roles */
diff --git a/pep_sphinx_extensions/pep_theme/templates/page.html b/pep_sphinx_extensions/pep_theme/templates/page.html
index 560edea8199..53a54bf87f0 100644
--- a/pep_sphinx_extensions/pep_theme/templates/page.html
+++ b/pep_sphinx_extensions/pep_theme/templates/page.html
@@ -46,11 +46,21 @@ <h1>Python Enhancement Proposals</h1>
                 <span class="visually-hidden">Toggle light / dark / auto colour theme</span>
             </button>
         </header>
+        {# Mobile search box - visible only on small screens #}
+        <div id="mobile-search" class="mobile-search-container"></div>
+        {# Exclude noisy non-PEP pages from Pagefind indexing #}
+        {%- if pagename.startswith(("404", "numerical", "pep-0000", "topic")) %}
         <article>
+        {%- else %}
+        <article data-pagefind-body>
+        {%- endif %}
+            {# Add pagefind meta for the title to improve search result display #}
+            <div data-pagefind-meta="title:{{ title }}" style="display:none;"></div>
             {{ body }}
         </article>
         {%- if not pagename.startswith(("404", "numerical")) %}
         <nav id="pep-sidebar">
+            <div id="search"></div>
             <h2>Contents</h2>
             {{ toc }}
             <br>
@@ -65,5 +75,18 @@ <h2>Contents</h2>
     <script src="{{ pathto('_static/sticky_banner.js', resource=True) }}"></script>
     <script src="https://analytics.python.org/js/script.outbound-links.js"
             data-domain="peps.python.org" defer></script>
+    <script src="/pagefind/pagefind-ui.js"></script>
+    <script>
+        window.addEventListener('DOMContentLoaded', (event) => {
+            // Initialize pagefind for desktop sidebar
+            new PagefindUI({ element: "#search", showSubResults: true });
+
+            // Initialize pagefind for mobile view
+            const mobileSearch = document.getElementById('mobile-search');
+            if (mobileSearch && window.innerWidth <= 640) {
+                new PagefindUI({ element: "#mobile-search", showSubResults: false });
+            }
+        });
+    </script>
 </body>
 </html>
diff --git a/requirements.txt b/requirements.txt
index ffcbe1a8aa6..5f6f4ce123c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,8 @@ Pygments >= 2.9.0
 Sphinx >= 5.1.1, != 6.1.0, != 6.1.1, < 8.1.0
 docutils >= 0.19.0
 sphinx-notfound-page >= 1.0.2
+# For search
+pagefind[bin] >= 1.3.0
 
 # For tests
 pytest