diff --git a/content/tags/_index.md b/content/tags/_index.md
index 70426305..38019f77 100644
--- a/content/tags/_index.md
+++ b/content/tags/_index.md
@@ -10,17 +10,7 @@ The preservation of once freshly baked but now perhaps stale thoughts.<br/> Not
 
 ### By search
 
-<script src="/_pagefind/pagefind-ui.js" type="text/javascript"></script>
-<div id="search"></div>
-<script>
-    window.addEventListener('DOMContentLoaded', (event) => {
-        new PagefindUI({ element: "#search", resetStyles: false });
-    });
-</script>
-
-<noscript>
-    ... Sorry, search functionality requires JavaScript to be enabled.
-</noscript>
+{{< search >}}
 
 ### By category
 
diff --git a/layouts/shortcodes/search.html b/layouts/shortcodes/search.html
new file mode 100644
index 00000000..22116525
--- /dev/null
+++ b/layouts/shortcodes/search.html
@@ -0,0 +1,20 @@
+<script src="/_pagefind/pagefind-ui.js" type="text/javascript"></script>
+<div id="search"></div>
+<script>
+    window.addEventListener('DOMContentLoaded', (event) => {
+        new PagefindUI({ element: "#search", resetStyles: false });
+    });
+</script>
+
+<noscript>
+    <form role="search" method="get" action="https://duckduckgo.com/" id="search">
+        <input type="text" style="width: 80%" name="q" placeholder="Search with DuckDuckGo…">
+        <input type="hidden" name="ia" value="web">
+        <input type="hidden" name="kaj" value="m">
+        <input type="hidden" name="k7" value="w">
+        <input type="hidden" name="k9" value="b">
+        <input type="hidden" name="ks" value="l">
+        <input type="hidden" name="sites" value="{{ $.Site.BaseURL }}">
+        <button type="submit" value="Search">Search</button>
+    </form>
+</noscript>
diff --git a/themes/brainbaking-minimal/assets/sass/_forms.sass b/themes/brainbaking-minimal/assets/sass/_forms.sass
index a83a18ca..794f9e0c 100644
--- a/themes/brainbaking-minimal/assets/sass/_forms.sass
+++ b/themes/brainbaking-minimal/assets/sass/_forms.sass
@@ -9,6 +9,7 @@
 
   button
     background-color: white
+    height: 2.7em
     border: 1px solid $accent
     color: $accent