diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index ba05f88aa..a829164d2 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -315,6 +315,8 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		remotebox_user.forceSaveScreen(true);
 		CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &pass, 15);
 		remotebox_pass.forceSaveScreen(true);
+
+		//menu add remote box
 		CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER);
 		rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, rbname, &remotebox_name));
 		rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, rbaddress, &remotebox_address));
@@ -325,8 +327,6 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		if ((rbsetup->exec(NULL,"") == true) && (!rbaddress.empty()))
 		{
 			remboxmenu->addItem(new CMenuForwarder(rbname, true, NULL, this, "cha_ip"));
-			rbsetup->hide();
-			remboxmenu->enableSaveScreen(false);
 			remboxmenu->hide();
 			timer_remotebox_item timer_rb;
 			timer_rb.rbaddress = rbaddress;
@@ -377,6 +377,8 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		remotebox_user.forceSaveScreen(true);
 		CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &it->pass, 15);
 		remotebox_pass.forceSaveScreen(true);
+
+		//remote box edit
 		CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER);
 		rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, it->rbname, &remotebox_name));
 		rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, it->rbaddress, &remotebox_address));
@@ -388,8 +390,6 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		{
 			it->port = atoi(port);
 			f->setName(it->rbname);
-			rbsetup->hide();
-			remboxmenu->enableSaveScreen(false);
 			remboxmenu->hide();
 			changed = true;
 		}
@@ -1098,7 +1098,7 @@ void CTimerList::hide()
 bool CTimerList::RemoteBoxSetup()
 {
 	bool ret = false;
-	remboxmenu = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER);
+	remboxmenu = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER, 50);
 	remboxmenu->addKey(CRCInput::RC_red, this, "del_ip");
 	remboxmenu->addKey(CRCInput::RC_green, this, "add_ip");
 
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index b06d3ce83..2d33021c7 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -869,8 +869,7 @@ bool CUpnpBrowserGui::selectItem(std::string id)
 			m_frameBuffer->Clear();
 			refresh = true;
 		}
-		else if (m_folderplay && (msg == (neutrino_msg_t) CRCInput::RC_prev)
-			|| video_key_msg == CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV){
+		else if (m_folderplay && ((msg == (neutrino_msg_t) CRCInput::RC_prev) || video_key_msg == CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV)){
 			timeout = 0;
 			m_playid -= 2;
 			if (m_playid < 0)
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 1b0dce605..5ec197d0b 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1454,10 +1454,8 @@ void CMenuWidget::enableSaveScreen(bool enable)
 
 void CMenuWidget::paintHint(int pos)
 {
-	if (!g_settings.show_menu_hints){
-		//ResetModules(); //ensure clean up on changed setting
+	if (!g_settings.show_menu_hints)
 		return;
-	}
 
 	if (pos < 0 && !hint_painted)
 		return;