diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index ebd02543a..03f2a8342 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -1245,7 +1245,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
 }
 
 //channellist
-void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
+void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist, bool hint_paint)
 {
 	CMenuOptionChooser * mc;
 
@@ -1254,38 +1254,45 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
 
 	// channellist additional
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_ADDITIONAL, &g_settings.channellist_additional, CHANNELLIST_ADDITIONAL_OPTIONS, CHANNELLIST_ADDITIONAL_OPTION_COUNT, true);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL);
 	menu_chanlist->addItem(mc);
 
 	// epg align
 	mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN);
 	menu_chanlist->addItem(mc);
 
 	// extended channel list
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.theme.progressbar_design_channellist, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
 	menu_chanlist->addItem(mc);
 
 	// show infobox
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_INFOBOX, &g_settings.channellist_show_infobox, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, channellistNotifier);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX);
 	menu_chanlist->addItem(mc);
 
 	// foot
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, g_settings.channellist_show_infobox);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
 	menu_chanlist->addItem(mc);
 	channellistNotifier->addItem(mc);
 
 	//show channel logo
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
 	menu_chanlist->addItem(mc);
 
 	//show numbers
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
-	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);
+	if(hint_paint)
+		mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);
 	menu_chanlist->addItem(mc);
 }
 
@@ -1508,7 +1515,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
 	menu_chanlist->enableFade(false);
 	menu_chanlist->setSelected(cselected);
 
-	showOsdChanlistSetup(menu_chanlist);
+	showOsdChanlistSetup(menu_chanlist, false);
 	menu_chanlist->addItem(new CMenuSeparator(CMenuSeparator::LINE));
 
 	CMenuWidget *fontSettingsSubMenu = new CMenuWidget(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_KEYBINDING);
@@ -1526,7 +1533,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
 	fontSettingsSubMenu->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[i].actionkey));
 
 	CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_HEAD, true, NULL, fontSettingsSubMenu, NULL, CRCInput::RC_red);
-	mf->setHint("", LOCALE_MENU_HINT_FONTS);
+// 	mf->setHint("", LOCALE_MENU_HINT_FONTS);//FIXME menu restoreScreen
 	menu_chanlist->addItem(mf);
 
 	int res = menu_chanlist->exec(NULL, "");
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index cdea56535..dbaaa2451 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -71,7 +71,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 		void showOsdTimeoutSetup(CMenuWidget *menu_timeout);
 		void showOsdMenusSetup(CMenuWidget *menu_menus);
 		void showOsdInfobarSetup(CMenuWidget *menu_infobar);
-		void showOsdChanlistSetup(CMenuWidget *menu_chanlist);
+		void showOsdChanlistSetup(CMenuWidget *menu_chanlist, bool hint_paint = true);
 		void showOsdEventlistSetup(CMenuWidget *menu_eventlist);
 		void showOsdVolumeSetup(CMenuWidget *menu_volume);
 		void showOsdInfoclockSetup(CMenuWidget *menu_infoclock);