diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp
index 9faac466c..6541142f9 100644
--- a/src/gui/WndMain.cpp
+++ b/src/gui/WndMain.cpp
@@ -104,7 +104,7 @@ unsigned ClearCachePartitions()
 	std::error_code err;
 	unsigned has_any_err = 0;
 
-	for (int partition_num = 3; partition_num < 8; ++partition_num) {
+	for (int partition_num = 3; partition_num < 6; ++partition_num) {
 		const std::string &partition = partition_path + std::to_string(partition_num);
 		for (const auto &directory_entry : std::filesystem::directory_iterator(partition, err)) {
 			if (err) {
diff --git a/src/gui/resource/Cxbx.rc b/src/gui/resource/Cxbx.rc
index a213c3d4c..89febd896 100644
--- a/src/gui/resource/Cxbx.rc
+++ b/src/gui/resource/Cxbx.rc
@@ -691,6 +691,7 @@ BEGIN
             MENUITEM "&Clear entire Symbol Cache",  ID_CACHE_CLEARHLECACHE_ALL,MFT_STRING,MFS_ENABLED
             MENUITEM "&Rescan title Symbol Cache",  ID_CACHE_CLEARHLECACHE_CURRENT,MFT_STRING,MFS_ENABLED
         END
+        MENUITEM "Clear Cache Partitions",  ID_SETTINGS_CLEAR_PARTITIONS,MFT_STRING,MFS_ENABLED
         MENUITEM "", -1, MFT_SEPARATOR
         POPUP "Experimental",                   65535,MFT_STRING,MFS_ENABLED
         BEGIN
@@ -713,7 +714,6 @@ BEGIN
         MENUITEM "Ignore Invalid Xbe Sections", ID_SETTINGS_IGNOREINVALIDXBESEC,MFT_STRING,MFS_ENABLED
         MENUITEM "Allow Admin Privilege",       ID_SETTINGS_ALLOWADMINPRIVILEGE,MFT_STRING,MFS_ENABLED
         MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "Clear cache partitions",      ID_SETTINGS_CLEAR_PARTITIONS,MFT_STRING,MFS_ENABLED
         MENUITEM "Reset To Defaults",           ID_SETTINGS_INITIALIZE,MFT_STRING,MFS_ENABLED
     END
     POPUP "E&mulation",                     65535,MFT_STRING,MFS_ENABLED