diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp
index 6610f53b2..a3208c7d3 100644
--- a/src/gui/widget/shellwindow.cpp
+++ b/src/gui/widget/shellwindow.cpp
@@ -191,9 +191,10 @@ CShellWindow::~CShellWindow()
 
 		neutrino_msg_t msg;
 		neutrino_msg_data_t data;
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 		do
-			g_RCInput->getMsg(&msg, &data, 100);
-		while (msg != CRCInput::RC_ok && msg != CRCInput::RC_home);
+			g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
+		while (msg != CRCInput::RC_ok && msg != CRCInput::RC_home && msg != CRCInput::RC_timeout);
 
 		frameBuffer->Clear();
 		frameBuffer->blit();