diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 05a1349a6..bc628a07e 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -799,7 +799,7 @@ void CMoviePlayerGui::PlayFile(void)
 		} else if ( msg == NeutrinoMessages::ZAPTO ||
 				msg == NeutrinoMessages::STANDBY_ON ||
 				msg == NeutrinoMessages::SHUTDOWN ||
-				msg == NeutrinoMessages::SLEEPTIMER) {	// Exit for Record/Zapto Timers
+				((msg == NeutrinoMessages::SLEEPTIMER) && !data) ) {	// Exit for Record/Zapto Timers
 			printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n");
 			if(msg != NeutrinoMessages::ZAPTO)
 				menu_ret = menu_return::RETURN_EXIT_ALL;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 412494b76..18d60fdab 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2864,9 +2864,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 			}
 		}
 		if(g_settings.shutdown_real)
-			ExitRun(true, (cs_get_revision() > 7));
-		else if(mode != mode_standby)
-			standbyMode( true );
+			g_RCInput->postMsg(NeutrinoMessages::SHUTDOWN, 0);
+		else
+			g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0);
 		return messages_return::handled;
 	}
 	else if( msg == NeutrinoMessages::RELOAD_SETUP ) {