diff --git a/web/src/app/(app)/search/page.tsx b/web/src/app/(app)/search/page.tsx
index 75ff166..50446d5 100644
--- a/web/src/app/(app)/search/page.tsx
+++ b/web/src/app/(app)/search/page.tsx
@@ -103,22 +103,28 @@ export default function SearchPage() {
           {error ? <div style={{ color: "var(--ml-text-secondary)" }}>{error}</div> : null}
           <div style={{ display: "grid", gap: "var(--ml-space-3)" }}>
             {notes.map((note) => (
-              <Link key={note.id} href={`/notes/${note.id}`} className="surface-muted" style={{ padding: "var(--ml-space-4)", display: "grid", gap: "var(--ml-space-2)" }}>
+              <div key={note.id} className="surface-muted" style={{ padding: "var(--ml-space-4)", display: "grid", gap: "var(--ml-space-2)" }}>
                 <div style={{ display: "grid", gridTemplateColumns: "minmax(0, 1.5fr) repeat(3, minmax(100px, auto))", gap: "var(--ml-space-3)", alignItems: "start" }}>
-                  <div style={{ display: "grid", gap: "var(--ml-space-2)" }}>
+                  <Link href={`/notes/${note.id}`} style={{ display: "grid", gap: "var(--ml-space-2)" }}>
                     <strong>{note.title}</strong>
                     <span style={{ color: "var(--ml-text-secondary)" }}>{note.excerpt}</span>
-                  </div>
-                  <span style={{ color: "var(--ml-text-secondary)" }}>{note.status}</span>
+                  </Link>
+                  <Link href={`/search?q=${encodeURIComponent(note.status)}`} style={{ color: "var(--ml-text-secondary)" }}>
+                    {note.status}
+                  </Link>
                   <span style={{ color: "var(--ml-text-secondary)" }}>{note.updatedBy}</span>
-                  <span style={{ color: "var(--ml-text-secondary)" }}>{note.workspaceId.replace("workspace-", "")}</span>
+                  <Link href={`/search?q=${encodeURIComponent(note.workspaceId.replace("workspace-", ""))}`} style={{ color: "var(--ml-text-secondary)" }}>
+                    {note.workspaceId.replace("workspace-", "")}
+                  </Link>
                 </div>
                 <div style={{ display: "flex", gap: "var(--ml-space-2)", flexWrap: "wrap" }}>
                   {note.tags.map((tag) => (
-                    <span key={tag} className="badge">#{tag}</span>
+                    <Link key={tag} href={`/search?q=${encodeURIComponent(tag)}`} className="badge">
+                      #{tag}
+                    </Link>
                   ))}
                 </div>
-              </Link>
+              </div>
             ))}
           </div>
         </section>