diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index a189ce33b..1249c2e1c 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;
 		}