diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 55437a472..d3653cd80 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1696,6 +1696,7 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade
 		return;
 	if(g_settings.channellist_show_channellogo){
 		int logo_w_max = full_width / 4;
+		int logo_h_max = theight - 2*OFFSET_INNER_MIN;
 		if (CChannelLogo) {
 			if (headerNew)
 				CChannelLogo->clearSavedScreen();
@@ -1707,8 +1708,8 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade
 
 		if (CChannelLogo->hasLogo()){
 			CChannelLogo->setWidth(min(CChannelLogo->getWidth(), logo_w_max), true);
-			if (CChannelLogo->getHeight() > theight) //scale image if required
-				CChannelLogo->setHeight(theight, true);
+			if (CChannelLogo->getHeight() > logo_h_max)
+				CChannelLogo->setHeight(logo_h_max, true);
 			CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth());
 			CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2);
 			CChannelLogo->paint();