diff --git a/controllers/ViewPhotoAlbum.php b/controllers/ViewPhotoAlbum.php
index 55c72b7d..f4e7f771 100644
--- a/controllers/ViewPhotoAlbum.php
+++ b/controllers/ViewPhotoAlbum.php
@@ -55,6 +55,7 @@ class ViewPhotoAlbum extends HTMLController
 			{
 				$filters[$contributor['slug']] = [
 					'id_user' => $contributor['id_user'],
+					'label' => $contributor['first_name'],
 					'caption' => sprintf('By %s (%s photos)',
 						$contributor['first_name'], $contributor['num_assets']),
 					'link' => $tag->getUrl() . '/?by=' . $contributor['slug'],
diff --git a/templates/AlbumButtonBox.php b/templates/AlbumButtonBox.php
index ea631eaa..7626fa3b 100644
--- a/templates/AlbumButtonBox.php
+++ b/templates/AlbumButtonBox.php
@@ -33,7 +33,16 @@ class AlbumButtonBox extends Template
 			echo '
 				<div class="dropdown">
 					<button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-						<i class="bi bi-filter"></i>
+						<i class="bi bi-filter"></i>';
+
+			if ($this->active_filter)
+			{
+				echo '
+						<span class="badge text-bg-danger">',
+							$this->filters[$this->active_filter]['label'], '</span>';
+			}
+
+			echo '
 					</button>
 					<ul class="dropdown-menu">';