diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 766011362..1e0858e69 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1052,12 +1052,15 @@ void CEventList::paintFoot(t_channel_id channel_id)
 		btn_cnt++;
 	}
 
-	//NI epg button for epg-plus
-	buttons[btn_cnt].button = NEUTRINO_ICON_BUTTON_EPG_SMALL;
-	buttons[btn_cnt].locale = LOCALE_EPGPLUS_HEAD;
-	btn_cnt++;
+	// epg button for epg-plus
+	if (g_settings.eventlist_epgplus)
+	{
+		buttons[btn_cnt].button = NEUTRINO_ICON_BUTTON_EPG_SMALL;
+		buttons[btn_cnt].locale = LOCALE_EPGPLUS_HEAD;
+		btn_cnt++;
+	}
 
-	//NI timerlist button
+	// timerlist button
 	buttons[btn_cnt].button = g_info.hw_caps->has_button_timer ? NEUTRINO_ICON_BUTTON_TIMER : NEUTRINO_ICON_BUTTON_0;
 	buttons[btn_cnt].locale = LOCALE_TIMERLIST_NAME;
 	btn_cnt++;