diff --git a/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt
index 62fcd7c849..f73a0fabf2 100644
--- a/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt
@@ -36,16 +36,16 @@ class EmpireOverviewScreen(
     init {
         val selectCategory = defaultCategory
             //TODO replace with `?: persistState.last` in a future update
-            ?: EmpireOverviewCategories.values().firstOrNull { it.name == game.settings.lastOverviewPage }
+            ?: EmpireOverviewCategories.entries.firstOrNull { it.name == game.settings.lastOverviewPage }
         val iconSize = Constants.defaultFontSize.toFloat()
 
         tabbedPager = TabbedPager(
             stage.width, stage.width,
             centerAreaHeight, centerAreaHeight,
             separatorColor = Color.WHITE,
-            capacity = EmpireOverviewCategories.values().size)
+            capacity = EmpireOverviewCategories.entries.size)
 
-        for (category in EmpireOverviewCategories.values()) {
+        for (category in EmpireOverviewCategories.entries) {
             val tabState = category.testState(viewingPlayer)
             if (tabState == EmpireOverviewTabState.Hidden) continue
             val icon = if (category.iconName.isEmpty()) null else ImageGetter.getImage(category.iconName)
@@ -78,7 +78,7 @@ class EmpireOverviewScreen(
         tabbedPager.selectPage(-1)  // trigger deselect on _old_ instance so the tabs can persist their stuff
         return EmpireOverviewScreen(viewingPlayer,
             //TODO replace with `persistState.last)` in a future update
-            EmpireOverviewCategories.values().firstOrNull { it.name == game.settings.lastOverviewPage })
+            EmpireOverviewCategories.entries.firstOrNull { it.name == game.settings.lastOverviewPage })
     }
 
     fun resizePage(tab: EmpireOverviewTab) {
@@ -111,7 +111,7 @@ class EmpireOverviewScreen(
         // This is called by UncivGame.popScreen - e.g. after City Tab opened a City and the user closes that CityScreen...
         // Notify the current tab via its IPageExtensions.activated entry point so it can refresh if needed
         val index = tabbedPager.activePage
-        val category = EmpireOverviewCategories.values().getOrNull(index - 1) ?: return
+        val category = EmpireOverviewCategories.entries.getOrNull(index) ?: return
         pageObjects[category]?.activated(index, "", tabbedPager) // Fake caption marks this as popScreen-triggered
     }
 }
diff --git a/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt
index 3272f79d09..dd58f71470 100644
--- a/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt
+++ b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt
@@ -25,7 +25,7 @@ abstract class EmpireOverviewTab (
         if (caption.isEmpty()) return // called from EmpireOverviewScreen.resume()
         //TODO remove line in a future update
         overviewScreen.game.settings.lastOverviewPage = caption
-        overviewScreen.persistState.last = EmpireOverviewCategories.values()[index]  // Change this if categories are ever reordered or filtered
+        overviewScreen.persistState.last = EmpireOverviewCategories.entries.toTypedArray()[index]  // Change this if categories are ever reordered or filtered
     }
 
     /** Override if the tab can _select_ something specific.