diff --git a/photologue/admin.py b/photologue/admin.py
index eae1eaa..0d1db81 100644
--- a/photologue/admin.py
+++ b/photologue/admin.py
@@ -5,14 +5,18 @@ from .models import Gallery, Photo, Tag
 
 
 class GalleryAdmin(admin.ModelAdmin):
-    list_display = ('title', 'date_start', 'photo_count')
-    list_filter = ['date_start']
+    list_display = ('title', 'date_start', 'photo_count', 'get_tags')
+    list_filter = ['date_start', 'tags']
     date_hierarchy = 'date_start'
     prepopulated_fields = {'slug': ('title',)}
     model = Gallery
     autocomplete_fields = ['photos', 'tags']
     search_fields = ['title', ]
 
+    def get_tags(self, obj):
+        return ", ".join([t.name for t in obj.tags.all()])
+    get_tags.short_description = _('tags')
+
 
 class PhotoAdmin(admin.ModelAdmin):
     list_display = ('title', 'date_taken', 'date_added',