diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 18d431de1..09cef99fa 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -838,6 +838,7 @@ bool CFileBrowser::exec(const char * const dirname)
 	neutrino_msg_data_t data;
 
 	bool res = false;
+	menu_ret = menu_return::RETURN_REPAINT;
 
 #ifdef ENABLE_INTERNETRADIO
 	if (m_Mode == ModeSC) {
@@ -1105,10 +1106,20 @@ bool CFileBrowser::exec(const char * const dirname)
 		else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) {
 			//FIXME do nothing ?
 		}
+		else if (msg == NeutrinoMessages::STANDBY_ON ||
+				msg == NeutrinoMessages::SHUTDOWN ||
+				msg == NeutrinoMessages::SLEEPTIMER)
+		{
+			menu_ret = menu_return::RETURN_EXIT_ALL;
+			loop = false;
+			g_RCInput->postMsg(msg, data);
+		}
+
 		else
 		{
 			if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all )
 			{
+				menu_ret = menu_return::RETURN_EXIT_ALL;
 				loop = false;
 			}
 		}
diff --git a/src/gui/filebrowser.h b/src/gui/filebrowser.h
index b1e92dabf..5cf100bdf 100644
--- a/src/gui/filebrowser.h
+++ b/src/gui/filebrowser.h
@@ -177,6 +177,7 @@ class CFileBrowser
 
 		int 			x;
 		int 			y;
+		int			menu_ret;
 
 		SMSKeyInput m_SMSKeyInput;
 
@@ -229,6 +230,7 @@ class CFileBrowser
 			{
 				return Path;
 			}
+		int  getMenuRet() { return menu_ret; }
 
 //		size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data);
 	private: