diff --git a/src/components/feed/PictureCard.tsx b/src/components/feed/PictureCard.tsx
index eeb6652..5c8c8e6 100644
--- a/src/components/feed/PictureCard.tsx
+++ b/src/components/feed/PictureCard.tsx
@@ -185,7 +185,15 @@ export function PictureCard({ event }: PictureCardProps) {
             {hashtags.length > 0 && (
               <div className="flex flex-wrap gap-2 mt-3">
                 {hashtags.map((tag) => (
-                  <Badge key={tag} variant="secondary" className="text-xs">
+                  <Badge 
+                    key={tag} 
+                    variant="secondary" 
+                    className="text-xs cursor-pointer hover:bg-secondary/80 transition-colors"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      navigate(`/tag/${tag}`);
+                    }}
+                  >
                     #{tag}
                   </Badge>
                 ))}
diff --git a/src/pages/PictureDetails.tsx b/src/pages/PictureDetails.tsx
index 2e8a1d4..3e63d70 100644
--- a/src/pages/PictureDetails.tsx
+++ b/src/pages/PictureDetails.tsx
@@ -185,7 +185,12 @@ function PictureDetailsContent({ event }: { event: NostrEvent }) {
             {hashtags.length > 0 && (
               <div className="flex flex-wrap gap-2">
                 {hashtags.map((tag) => (
-                  <Badge key={tag} variant="secondary" className="text-sm">
+                  <Badge 
+                    key={tag} 
+                    variant="secondary" 
+                    className="text-sm cursor-pointer hover:bg-secondary/80 transition-colors"
+                    onClick={() => navigate(`/tag/${tag}`)}
+                  >
                     #{tag}
                   </Badge>
                 ))}