diff --git a/marietje/queues/admin.py b/marietje/queues/admin.py
index b29c62d..8acdccb 100644
--- a/marietje/queues/admin.py
+++ b/marietje/queues/admin.py
@@ -3,12 +3,17 @@ from .models import Queue, Playlist, PlaylistSong, QueueCommand
 
 
 admin.site.register(Playlist)
-admin.site.register(PlaylistSong)
 
 
 @admin.register(Queue)
 class OrderAdmin(admin.ModelAdmin):
     list_display = ('name', 'playlist', 'random_playlist')
 
+@admin.register(PlaylistSong)
+class PlaylistSongAdmin(admin.ModelAdmin):
+    list_display = ('playlist', 'song', 'user', 'state', 'played_at')
+    list_filter = ('playlist', 'state', 'user')
+    search_fields = ('song', )
+
 
 admin.site.register(QueueCommand)