diff --git a/static/js/filter.js b/static/js/filter.js
index 4c5f7a5..933cced 100644
--- a/static/js/filter.js
+++ b/static/js/filter.js
@@ -23,7 +23,10 @@ function filterSongs() {
 	const searchTerm = sanitizeString(search.value);
 	const songs = Array.from(songList.children);
 	songs.forEach(song => {
-		const matching = song.dataset.title.includes(searchTerm) && (!selectedCategory || song.dataset.category === selectedCategory);
+		const matching = (
+			(song.dataset.title.includes(searchTerm) || (song.dataset.artist && song.dataset.artist.includes(searchTerm))) &&
+			(!selectedCategory || song.dataset.category === selectedCategory)
+		);
 		song.classList.toggle("hidden", !matching);
 	});
 }
diff --git a/templates/index.html b/templates/index.html
index b9ef728..fe81a53 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,7 +21,13 @@
 		</section>
 		<section class="song-list">
 			{% for song in section.pages %}
-				<div class="{{ macros::primary_category(song=song) }}" data-title="{{ song.title }}" data-category="{{ macros::primary_category(song=song) }}">
+				<div class="{{ macros::primary_category(song=song) }}"
+					data-title="{{ song.title }}"
+					data-category="{{ macros::primary_category(song=song) }}"
+					{% if song.taxonomies["artist"] %}
+						data-artist="{{ song.taxonomies["artist"][0] }}"
+					{% endif %}
+				>
 					<div class="meta">
 						<div class="title">{{ song.title }}</div>
 						{% if song.taxonomies["artist"] %}