diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index aa239944b..835351085 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -519,7 +519,8 @@ int CTimerList::show()
 			}
 		}
 		else if ( ( msg == CRCInput::RC_timeout ) ||
-				( msg == CRCInput::RC_home)  || (msg == CRCInput::RC_left) )
+				( msg == CRCInput::RC_home)  || (msg == CRCInput::RC_left) ||
+				(( msg == CRCInput::RC_ok) && (timerlist.empty())) )
 		{	//Exit after timeout or cancel key
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);