diff --git a/core/src/com/unciv/logic/github/Github.kt b/core/src/com/unciv/logic/github/Github.kt
index 826c2f1c2a..4e182c4e1b 100644
--- a/core/src/com/unciv/logic/github/Github.kt
+++ b/core/src/com/unciv/logic/github/Github.kt
@@ -150,7 +150,7 @@ object Github {
     }
 
     private fun isValidModFolder(dir: FileHandle): Boolean {
-        val goodFolders = listOf("Images", "jsons", "maps", "music", "sounds", "Images\\..*")
+        val goodFolders = listOf("Images", "jsons", "maps", "music", "sounds", "Images\\..*", "scenarios")
             .map { Regex(it, RegexOption.IGNORE_CASE) }
         val goodFiles = listOf(".*\\.atlas", ".*\\.png", "preview.jpg", ".*\\.md", "Atlases.json", ".nomedia", "license")
             .map { Regex(it, RegexOption.IGNORE_CASE) }
diff --git a/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt b/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt
index b48e04de3a..0168a9863a 100644
--- a/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt
+++ b/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt
@@ -139,7 +139,11 @@ class ModManagementScreen private constructor(
             if (game.settings.tileSet !in tileSets) {
                 game.settings.tileSet = tileSets.first()
             }
-            game.popScreen()
+            val screen = game.popScreen()
+            
+            // We want to immediately display/hide Scenario button based on changes
+            if (screen is MainMenuScreen)
+                screen.game.replaceCurrentScreen(MainMenuScreen())
         }
         closeButton.keyShortcuts.add(KeyCharAndCode.BACK)