diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 7ac8b367a..2481945d4 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -906,8 +906,10 @@ int CChannelList::show()
 		res = bouquetList->exec(true);
 		printf("CChannelList:: bouquetList->exec res %d\n", res);
 	}
+#if 0
 	/* FIXME call this somewhere after show */
 	CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
+#endif
 	this->new_mode_active = 0;
 
 	if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode())
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index d682d9df9..0c8b2f374 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1206,6 +1206,7 @@ int CEventFinderMenu::exec(CMenuTarget* parent, const std::string &actionkey)
 			if (nNewBouquet > -1)
 			{
 				int nNewChannel = bouquetList->Bouquets[nNewBouquet]->channelList->show();
+				CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 				//printf("nNewChannel %d\n",nNewChannel);
 				if (nNewChannel > -1)
 				{
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 4c648e157..b8b208a75 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2327,6 +2327,8 @@ _show:
 				nNewChannel = bouquetList->exec(true);
 			}
 _repeat:
+			CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
+			CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 			printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout);
 			if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel
 				/* FIXME if mode was changed while browsing,