diff --git a/Core/Util/MemStick.cpp b/Core/Util/MemStick.cpp
index b8d47f50ac..0b71dd0612 100644
--- a/Core/Util/MemStick.cpp
+++ b/Core/Util/MemStick.cpp
@@ -22,7 +22,7 @@
 bool FolderSeemsToBeUsed(const Path &newMemstickFolder) {
 	// Inspect the potential new folder, quickly. We could add more criteria like checking for actual savegames.
 	const Path pspFolder = GetPSPFolderOf(newMemstickFolder);
-	return File::Exists(pspFolder / "SAVEDATA") || File::Exists(pspFolder / "SYSTEM");
+	return File::Exists(pspFolder / "SAVEDATA") || File::Exists(pspFolder / "SYSTEM") || File::Exists(pspFolder / "PPSSPP_STATE");
 }
 
 // Checked by string rather than Type(), which only says CONTENT_URI on Android, so the checks below can
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
index 88a9b709ec..1ebda9d0fc 100644
--- a/UI/MemStickScreen.cpp
+++ b/UI/MemStickScreen.cpp
@@ -561,6 +561,8 @@ void ConfirmMemstickMoveScreen::CreateViews() {
 		leftColumn->Add(new NoticeView(NoticeLevel::SUCCESS, ms->T("Already contains PSP data"), ""));
 		if (!moveData_) {
 			leftColumn->Add(new NoticeView(NoticeLevel::INFO, ms->T("No data will be changed"), ""));
+		} else {
+			leftColumn->Add(new NoticeView(NoticeLevel::WARN, ms->T("MoveReplacesFiles", "Previously existing files in the new folder will be replaced by moved files with the same names"), ""));
 		}
 	}