diff --git a/src/pages/search.css b/src/pages/search.css
index 9d7f13b5..92105bd6 100644
--- a/src/pages/search.css
+++ b/src/pages/search.css
@@ -1,3 +1,6 @@
+#search-page .deck > header .header-grid {
+  grid-template-columns: auto 1fr auto;
+}
 #search-page header input {
   width: 100%;
   padding: 8px 16px;
@@ -24,6 +27,17 @@
   align-items: center;
 }
 
+ul.link-list.hashtag-list {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+ul.link-list.hashtag-list li a {
+  border-radius: var(--radius);
+}
+
 @media (min-width: 40em) {
   #search-page header input {
     background-color: var(--bg-color);
diff --git a/src/pages/search.jsx b/src/pages/search.jsx
index 341b7862..90b7cc8b 100644
--- a/src/pages/search.jsx
+++ b/src/pages/search.jsx
@@ -97,7 +97,7 @@ function Search() {
               )}
               <h2 class="timeline-header">Hashtags</h2>
               {hashtagResults.length > 0 ? (
-                <ul class="link-list">
+                <ul class="link-list hashtag-list">
                   {hashtagResults.map((hashtag) => (
                     <li>
                       <Link