diff --git a/web/src/app/(app)/workspaces/page.tsx b/web/src/app/(app)/workspaces/page.tsx
index 8dd9f3f..9bd7f70 100644
--- a/web/src/app/(app)/workspaces/page.tsx
+++ b/web/src/app/(app)/workspaces/page.tsx
@@ -143,13 +143,19 @@ export default function WorkspacesPage() {
                   <div style={{ color: "var(--ml-text-secondary)", marginTop: 6 }}>{workspace.description}</div>
                 </div>
                 <div style={{ display: "grid", gap: 8, justifyItems: "end" }}>
-                  <div className="badge">{workspace.visibility}</div>
-                  <span style={{ color: "var(--ml-text-secondary)" }}>Owner: {workspace.owner}</span>
+                  <Link href={`/workspaces?q=${encodeURIComponent(workspace.visibility)}`} className="badge">
+                    {workspace.visibility}
+                  </Link>
+                  <Link href={`/workspaces?q=${encodeURIComponent(workspace.owner)}`} style={{ color: "var(--ml-text-secondary)" }}>
+                    Owner: {workspace.owner}
+                  </Link>
                 </div>
               </div>
               <div style={{ display: "flex", gap: "var(--ml-space-2)", flexWrap: "wrap" }}>
                 {workspace.tags.map((tag) => (
-                  <span key={tag} className="badge">#{tag}</span>
+                  <Link key={tag} href={`/workspaces?q=${encodeURIComponent(tag)}`} className="badge">
+                    #{tag}
+                  </Link>
                 ))}
               </div>
               <div style={{ display: "grid", gap: "var(--ml-space-3)" }}>