diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 80adc7b31..9307341a3 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -498,7 +498,7 @@ int CBouquetList::show(bool bShowChannelList)
 		}
 
 		else if ( msg == CRCInput::RC_ok ) {
-			if(!bShowChannelList || Bouquets[selected]->channelList->getSize() > 0) {
+			if(!bShowChannelList || !Bouquets[selected]->channelList->isEmpty()) {
 				zapOnExit = true;
 				loop=false;
 			}
@@ -577,7 +577,7 @@ void CBouquetList::paintItem(int pos)
 			CVFD::getInstance()->showMenuText(0, lname, -1, true);
 	} else {
 		if(npos < (int) Bouquets.size())
-			iscurrent = Bouquets[npos]->channelList->getSize() > 0;
+			iscurrent = !Bouquets[npos]->channelList->isEmpty();
                 color = iscurrent ? COL_MENUCONTENT : COL_MENUCONTENTINACTIVE;
                 bgcolor = iscurrent ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0;
 		frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor);
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index f7c8b1d57..8bd796915 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -689,11 +689,11 @@ int CChannelList::show()
 			if (!bouquetList->Bouquets.empty()) {
 				bool found = true;
 				uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
-				if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
+				if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) {
 					found = false;
 					nNext = nNext < bouquetList->Bouquets.size()-1 ? nNext+1 : 0;
 					for(uint32_t i = nNext; i < bouquetList->Bouquets.size(); i++) {
-						if(bouquetList->Bouquets[i]->channelList->getSize() > 0) {
+						if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
 							found = true;
 							nNext = i;
 							break;
@@ -711,11 +711,11 @@ int CChannelList::show()
 			if (!bouquetList->Bouquets.empty()) {
 				bool found = true;
 				int nNext = (bouquetList->getActiveBouquetNumber()+bouquetList->Bouquets.size()-1) % bouquetList->Bouquets.size();
-				if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
+				if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) {
 					found = false;
 					nNext = nNext > 0 ? nNext-1 : bouquetList->Bouquets.size()-1;
 					for(int i = nNext; i > 0; i--) {
-						if(bouquetList->Bouquets[i]->channelList->getSize() > 0) {
+						if(!bouquetList->Bouquets[i]->channelList->isEmpty()) {
 							found = true;
 							nNext = i;
 							break;
@@ -1186,7 +1186,7 @@ int CChannelList::numericZap(int key)
 						channelList->addChannel(orgList->chanlist[i]);
 				}
 			}
-			if (channelList->getSize() != 0) {
+			if ( !channelList->isEmpty()) {
 				channelList->adjustToChannelID(orgList->getActiveChannel_ChannelID(), false);
 				this->frameBuffer->paintBackground();
 				res = channelList->exec();
@@ -1206,7 +1206,7 @@ int CChannelList::numericZap(int key)
 					if(channel) channelList->addChannel(channel);
 				}
 			}
-			if (channelList->getSize() != 0) {
+			if ( !channelList->isEmpty() ) {
 				this->frameBuffer->paintBackground();
 				res = channelList->exec();
 				CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
@@ -1968,6 +1968,11 @@ void CChannelList::paint()
 	showChannelLogo();
 }
 
+bool CChannelList::isEmpty() const
+{
+	return this->chanlist.empty();
+}
+
 int CChannelList::getSize() const
 {
 	return this->chanlist.size();
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index e3b360156..bf1b78319 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -146,6 +146,7 @@ public:
 	int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
 
 	int getSize() const;
+	bool isEmpty() const;
 	int getSelectedChannelIndex() const;
 	void setSize(int newsize);
 	int doChannelMenu(void);
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 386285bcf..84e4d42df 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -883,11 +883,11 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 					bool found = true;
 					uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
 //printf("**************************** EpgPlus::exec current bouquet %d new %d\n", bouquetList->getActiveBouquetNumber(), nNext);
-					if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
+					if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) {
 						found = false;
 						nNext = nNext < bouquetList->Bouquets.size()-1 ? nNext+1 : 0;
 						for(uint32_t i = nNext; i < bouquetList->Bouquets.size(); i++) {
-							if(bouquetList->Bouquets[i]->channelList->getSize() > 0) {
+							if(!bouquetList->Bouquets[i]->channelList->isEmpty() ) {
 								found = true;
 								nNext = i;
 								break;
@@ -909,11 +909,11 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 				if (!bouquetList->Bouquets.empty()) {
 					bool found = true;
 					int nNext = (bouquetList->getActiveBouquetNumber()+bouquetList->Bouquets.size()-1) % bouquetList->Bouquets.size();
-					if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
+					if(bouquetList->Bouquets[nNext]->channelList->isEmpty()) {
 						found = false;
 						nNext = nNext > 0 ? nNext-1 : bouquetList->Bouquets.size()-1;
 						for(int i = nNext; i > 0; i--) {
-							if(bouquetList->Bouquets[i]->channelList->getSize() > 0) {
+							if(!bouquetList->Bouquets[i]->channelList->isEmpty()) {
 								found = true;
 								nNext = i;
 								break;
@@ -1261,7 +1261,7 @@ int CEPGplusHandler::exec (CMenuTarget * parent, const std::string & /*actionKey
 	//channelList = CNeutrinoApp::getInstance()->channelList;
 	int bnum = bouquetList->getActiveBouquetNumber();
 	current_bouquet = bnum;
-	if(!bouquetList->Bouquets.empty() && bouquetList->Bouquets[bnum]->channelList->getSize() > 0)
+	if(!bouquetList->Bouquets.empty() && !bouquetList->Bouquets[bnum]->channelList->isEmpty() )
 		channelList = bouquetList->Bouquets[bnum]->channelList;
 	else
 		channelList = CNeutrinoApp::getInstance()->channelList;