diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index f6717c507..fc643812f 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -754,21 +754,11 @@ int CChannelList::show()
 				if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) {
 					found = false;
 					nNext = (nNext + b_size + dir) % b_size;
-					if(msg == (neutrino_msg_t)g_settings.key_bouquet_down){
-						for (int i = nNext; i > 0; i--) {
-							if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
-								found = true;
-								nNext = i;
-								break;
-							}
-						}
-					}else{
-						for (int i = nNext; i < b_size; i++) {
-							if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
-								found = true;
-								nNext = i;
-								break;
-							}
+					for (int i = nNext; i < b_size; i++) {
+						if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
+							found = true;
+							nNext = i;
+							break;
 						}
 					}
 				}