diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 4878e5b0c..1c5564aff 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -67,6 +67,7 @@ time_t EpgPlus::duration = 0;
 
 int EpgPlus::sliderWidth = 0;
 int EpgPlus::channelsTableWidth = 0;
+int EpgPlus::entryFontSize = 0;
 
 /* negative size means "screen width in percent" */
 static EpgPlus::SizeSetting sizeSettingTable[] =
@@ -260,7 +261,6 @@ EpgPlus::ChannelEventEntry::ChannelEventEntry(const CChannelEvent * pchannelEven
 
 void EpgPlus::ChannelEventEntry::init()
 {
-	//TODO: re-implement bigfont handling
 	font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM];
 	separationLineThickness = sizes[EPGPlus_separationline_thickness];
 }
@@ -349,7 +349,6 @@ EpgPlus::ChannelEntry::ChannelEntry(const CZapitChannel * pchannel, int pindex,
 
 void EpgPlus::ChannelEntry::init()
 {
-	//TODO: re-implement bigfont handling
 	font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM];
 	separationLineThickness = sizes[EPGPlus_separationline_thickness];
 }
@@ -698,6 +697,15 @@ void EpgPlus::init()
 		sizes[i] = size;
 	}
 
+	if (entryFontSize == 0)
+		entryFontSize = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->getSize();
+
+	// reset possible bigfont
+	g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize(entryFontSize);
+
+	if (bigfont)
+		g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize((int)(entryFontSize * BIGFONT_FACTOR));
+
 	Header::init();
 	TimeLine::init();
 	ChannelEntry::init();
@@ -1243,6 +1251,9 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
 	}
 	this->displayedChannelEntries.clear();
 
+	// reset possible bigfont
+	g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize(entryFontSize);
+
 	return res;
 }
 
diff --git a/src/gui/epgplus.h b/src/gui/epgplus.h
index d3a46f9c9..9efaef825 100644
--- a/src/gui/epgplus.h
+++ b/src/gui/epgplus.h
@@ -425,6 +425,7 @@ class EpgPlus
 		static time_t	duration;
 
 		int		entryHeight;
+		static int	entryFontSize;
 
 		TViewMode	currentViewMode;
 		TSwapMode	currentSwapMode;