diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index ddb5ea6..46bb8ac 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -76,9 +76,12 @@
 	while (1) {
 		if (g_dnl_detach())
 			break;
-		if (ctrlc())
-			break;
-		WATCHDOG_RESET();
+		if (tstc()) {
+			int ch = getc();
+			if (ch == 0x03) /* ^C - Control C */
+				break;
+			puts("\rIn fastboot mode. Press Control-C to exit.\n");
+		}
 		usb_gadget_handle_interrupts(controller_index);
 	}