diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 1ea492bb0..76964a117 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -845,10 +845,6 @@ 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())
@@ -1187,6 +1183,7 @@ int CChannelList::numericZap(int key)
 				channelList->adjustToChannelID(orgList->getActiveChannel_ChannelID(), false);
 				this->frameBuffer->paintBackground();
 				res = channelList->exec();
+				CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 			}
 			delete channelList;
 			return res;
@@ -1205,6 +1202,7 @@ int CChannelList::numericZap(int key)
 			if (channelList->getSize() != 0) {
 				this->frameBuffer->paintBackground();
 				res = channelList->exec();
+				CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 			}
 			delete channelList;
 		}