diff --git a/approot/artists.xml b/approot/artists.xml
index 368eb13f..43dcc37c 100644
--- a/approot/artists.xml
+++ b/approot/artists.xml
@@ -20,6 +20,7 @@
 	<div class="list-group-item">
 		<span class="badge">${nb-release}</span>
 		${name}
+		${clusters}
 	</div>
 </message>
 
diff --git a/docroot/css/lms.css b/docroot/css/lms.css
index 03d32c2b..35ec32de 100644
--- a/docroot/css/lms.css
+++ b/docroot/css/lms.css
@@ -1,4 +1,7 @@
 
+.Lms-cluster {
+}
+
 .Lms-cluster-type-0 {
 	background-color: darkslategrey;
 }
diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp
index 1dedd55f..702f23b2 100644
--- a/src/ui/LmsApplication.cpp
+++ b/src/ui/LmsApplication.cpp
@@ -183,6 +183,8 @@ LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete
 	res->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::TextFormat::Plain);
 	res->setCondition("if-can-delete", canDelete);
 
+	res->setStyleClass("Lms-cluster");
+
 	return res;
 }
 
diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp
index 3bae5b00..025bc6f7 100644
--- a/src/ui/explore/ArtistView.cpp
+++ b/src/ui/explore/ArtistView.cpp
@@ -22,8 +22,8 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Types.hpp"
 #include "database/Setting.hpp"
+#include "database/Types.hpp"
 
 #include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp
index 45ccfce1..8cd3ec77 100644
--- a/src/ui/explore/ArtistsView.cpp
+++ b/src/ui/explore/ArtistsView.cpp
@@ -21,6 +21,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WLineEdit.h>
 
+#include "database/Setting.hpp"
 #include "database/Types.hpp"
 
 #include "utils/Logger.hpp"
@@ -30,14 +31,44 @@
 #include "Filters.hpp"
 #include "ArtistsView.hpp"
 
-namespace UserInterface {
-
 using namespace Database;
 
+namespace {
+
+const std::string artistsClusterTypesSetting = "artists_cluster_types";
+const std::vector<std::string> defaultArtistsClusterTypes =
+{
+	"ALBUMGROUPING",
+	"GENRE",
+	"ALBUMMOOD",
+};
+
+std::vector<ClusterType::pointer> getArtistsClusterTypes(Wt::Dbo::Session& session)
+{
+	Wt::Dbo::Transaction transaction(session);
+
+	std::vector<ClusterType::pointer> res;
+	for (auto clusterTypeName : splitString(Setting::getString(session, artistsClusterTypesSetting), " "))
+	{
+		auto clusterType = ClusterType::getByName(session, clusterTypeName);
+		if (clusterType)
+			res.push_back(clusterType);
+	}
+
+	return res;
+}
+
+}
+
+namespace UserInterface {
+
 Artists::Artists(Filters* filters)
 : Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template")),
   _filters(filters)
 {
+	if (!Setting::exists(LmsApp->getDboSession(), artistsClusterTypesSetting))
+		Setting::setString(LmsApp->getDboSession(), artistsClusterTypesSetting, joinStrings(defaultArtistsClusterTypes, " "));
+
 	addFunction("tr", &Wt::WTemplate::Functions::tr);
 
 	_search = bindNew<Wt::WLineEdit>("search");
@@ -87,6 +118,26 @@ Artists::addSome()
 
 		entry->bindInt("nb-release", artist->getReleases(clusterIds).size());
 		entry->bindWidget("name", LmsApplication::createArtistAnchor(artist));
+
+
+		Wt::WContainerWidget* clusterContainers = entry->bindNew<Wt::WContainerWidget>("clusters");
+		{
+			auto clusterTypes = getArtistsClusterTypes(LmsApp->getDboSession());
+			auto clusterGroups = artist->getClusterGroups(clusterTypes, 1);
+
+			for (auto clusters : clusterGroups)
+			{
+				for (auto cluster : clusters)
+				{
+					auto clusterId = cluster.id();
+					auto entry = clusterContainers->addWidget(LmsApp->createCluster(cluster));
+					entry->clicked().connect([=]
+					{
+						_filters->add(clusterId);
+					});
+				}
+			}
+		}
 	}
 
 	_showMore->setHidden(!moreResults);