diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp
index 453c086f7..c16d632b9 100644
--- a/es-app/src/views/GamelistView.cpp
+++ b/es-app/src/views/GamelistView.cpp
@@ -87,7 +87,12 @@ void GamelistView::onShow()
 
 void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme)
 {
-    mLegacyMode = mTheme->isLegacyTheme();
+    auto themeSets = ThemeData::getThemeSets();
+    std::map<std::string, ThemeData::ThemeSet>::const_iterator selectedSet {
+        themeSets.find(Settings::getInstance()->getString("ThemeSet"))};
+
+    assert(selectedSet != themeSets.cend());
+    mLegacyMode = selectedSet->second.capabilities.legacyTheme;
 
     if (mLegacyMode) {
         legacyOnThemeChanged(theme);