diff --git a/gallery/templates/gallery/photo_detail.html b/gallery/templates/gallery/photo_detail.html
index 32d9360..47dd3ef 100644
--- a/gallery/templates/gallery/photo_detail.html
+++ b/gallery/templates/gallery/photo_detail.html
@@ -107,6 +107,10 @@
                         <div class="uk-width-expand" uk-leader>Focal Length in 35mm</div>
                         <div>{{ photo.exif.FocalLengthIn35mmFilm|exif_focallength }}</div>
                     </div>
+                    <div class="uk-grid-small" uk-grid>
+                        <div class="uk-width-expand" uk-leader>Keywords</div>
+                        <div>{{ photo.exif.Keywords|exif_keywords }}</div>
+                    </div>
                 </div>
             </li>
         </ul>
diff --git a/gallery/templatetags/exif_filters.py b/gallery/templatetags/exif_filters.py
index 5967f75..bae9cf6 100644
--- a/gallery/templatetags/exif_filters.py
+++ b/gallery/templatetags/exif_filters.py
@@ -43,5 +43,15 @@ def exif_isospeedratings(value):
     """Convert ISO Speed Ratings"""
     try:
         return f"{int(value)}"
+    except:
+        return ""
+    
+
+@register.filter(name="exif_keywords")
+def exif_keywords(value):
+    """Convert Keywords"""
+    try:
+        words = list(dict.fromkeys(value))
+        return ", ".join(words)
     except:
         return ""
\ No newline at end of file