diff --git a/marietje/queues/admin.py b/marietje/queues/admin.py
index 8acdccb..ffed8dd 100644
--- a/marietje/queues/admin.py
+++ b/marietje/queues/admin.py
@@ -13,7 +13,7 @@ class OrderAdmin(admin.ModelAdmin):
 class PlaylistSongAdmin(admin.ModelAdmin):
     list_display = ('playlist', 'song', 'user', 'state', 'played_at')
     list_filter = ('playlist', 'state', 'user')
-    search_fields = ('song', )
+    search_fields = ('song__title', 'song__artist', 'user__name')
 
 
 admin.site.register(QueueCommand)