diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 147a7f5..84af299 100755
Binary files a/bin/driver7M5.bin and b/bin/driver7M5.bin differ
diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 344c282..a0c8cbd 100755
Binary files a/bin/rom8M.bin and b/bin/rom8M.bin differ
diff --git a/rdisk.c b/rdisk.c
index 7c0cca8..16145f4 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -17,9 +17,12 @@ static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, P
 
 	// Sample R and A keys repeatedly
 	char r = 0, a = 0;
-	for (long i = 0; i < 100000; i++) {
-		r = r | RDiskIsRPressed();
-		a = a | RDiskIsAPressed();
+	long tmax = TickCount() + 60;
+	for (long i = 0; i < 1000000; i++) {
+		r |= RDiskIsRPressed();
+		a |= RDiskIsAPressed();
+		if (r && a) { break; }
+		if (TickCount() > tmax) { break; }
 	}
 
 	// Decode settings: unmount (don't boot), mount (after boot), RAM disk