diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 5b3cf5730..a8afb2431 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -1010,6 +1010,11 @@ int CHDDMenuHandler::checkDevice(std::string dev)
 	int percent = 0, opercent = 0;
 	char buf[256] = { 0 };
 
+	bool loop;
+	uint64_t timeoutEnd;
+	neutrino_msg_t      msg;
+	neutrino_msg_data_t data;
+
 	std::string devname = "/dev/" + dev;
 
 	printf("CHDDMenuHandler::checkDevice: dev %s\n", dev.c_str());
@@ -1079,7 +1084,16 @@ int CHDDMenuHandler::checkDevice(std::string dev)
 
 	progress->showGlobalStatus(100);
 	progress->showStatusMessageUTF(buf);
-	sleep(2);
+
+	timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	loop = true;
+	while (loop)
+	{
+		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
+		if (msg == CRCInput::RC_timeout || msg == CRCInput::RC_ok || msg == CRCInput::RC_home)
+			loop = false;
+	}
+
 	progress->hide();
 	delete progress;