diff --git a/es-app/src/guis/GuiScraperMenu.cpp b/es-app/src/guis/GuiScraperMenu.cpp
index 2f009ed53..2df3ec7bb 100644
--- a/es-app/src/guis/GuiScraperMenu.cpp
+++ b/es-app/src/guis/GuiScraperMenu.cpp
@@ -796,6 +796,19 @@ void GuiScraperMenu::openOtherOptions()
         }
     });
 
+    // Include actual folders when scraping.
+    auto scraper_include_folders = std::make_shared<SwitchComponent>(mWindow);
+    scraper_include_folders->setState(Settings::getInstance()->getBool("ScraperIncludeFolders"));
+    s->addWithLabel("SCRAPE ACTUAL FOLDERS", scraper_include_folders);
+    s->addSaveFunc([scraper_include_folders, s] {
+        if (scraper_include_folders->getState() !=
+            Settings::getInstance()->getBool("ScraperIncludeFolders")) {
+            Settings::getInstance()->setBool("ScraperIncludeFolders",
+                                             scraper_include_folders->getState());
+            s->setNeedsSaving();
+        }
+    });
+
     // Interactive scraping.
     auto scraper_interactive = std::make_shared<SwitchComponent>(mWindow);
     scraper_interactive->setState(Settings::getInstance()->getBool("ScraperInteractive"));
@@ -867,19 +880,6 @@ void GuiScraperMenu::openOtherOptions()
             ->setOpacity(DISABLED_OPACITY);
     }
 
-    // Include actual folders when scraping.
-    auto scraper_include_folders = std::make_shared<SwitchComponent>(mWindow);
-    scraper_include_folders->setState(Settings::getInstance()->getBool("ScraperIncludeFolders"));
-    s->addWithLabel("SCRAPE ACTUAL FOLDERS", scraper_include_folders);
-    s->addSaveFunc([scraper_include_folders, s] {
-        if (scraper_include_folders->getState() !=
-            Settings::getInstance()->getBool("ScraperIncludeFolders")) {
-            Settings::getInstance()->setBool("ScraperIncludeFolders",
-                                             scraper_include_folders->getState());
-            s->setNeedsSaving();
-        }
-    });
-
     // Retry search on peer verification errors (TLS/certificate issues).
     auto retry_peer_verification = std::make_shared<SwitchComponent>(mWindow);
     retry_peer_verification->setState(
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index d9948d636..fba4bcf5a 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -121,11 +121,11 @@ void Settings::setDefaults()
     mBoolMap["ScraperOverwriteData"] = {true, true};
     mBoolMap["ScraperHaltOnInvalidMedia"] = {true, true};
     mBoolMap["ScraperSearchMetadataName"] = {true, true};
+    mBoolMap["ScraperIncludeFolders"] = {true, true};
     mBoolMap["ScraperInteractive"] = {true, true};
     mBoolMap["ScraperSemiautomatic"] = {true, true};
     mBoolMap["ScraperRespectExclusions"] = {true, true};
     mBoolMap["ScraperExcludeRecursively"] = {true, true};
-    mBoolMap["ScraperIncludeFolders"] = {false, false};
     mBoolMap["ScraperRetryPeerVerification"] = {false, false};
 
     // UI settings.