diff --git a/menu.cpp b/menu.cpp
index 8f1b930..ca85ab1 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -1889,6 +1889,11 @@ void HandleUI(void)
 			OsdWrite(8, "          Saving...");
 			menustate = MENU_GENERIC_SAVE_WAIT;
 		}
+		else if (is_arcade() && spi_uio_cmd(UIO_CHK_UPLOAD))
+		{
+			menu_save_timer = GetTimer(1000);
+			arcade_nvm_save();
+		}
 		else if (menu)
 		{
 			menustate = MENU_NONE1;
diff --git a/user_io.cpp b/user_io.cpp
index cb530b2..f5ceaf3 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -3176,7 +3176,6 @@ void user_io_poll()
 
 	if (is_megacd()) mcd_poll();
 	if (is_pce()) pcecd_poll();
-	if (is_arcade() && spi_uio_cmd(UIO_CHK_UPLOAD)) arcade_nvm_save();
 	process_ss(0);
 }