diff --git a/data/keymap.xml b/data/keymap.xml
index d3bbde02cad..111e990993b 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -623,6 +623,8 @@
 		<key id="KEY_TV2" mapto="toggleTvRadio" flags="b" />
 		<key id="KEY_RADIO" mapto="keyRadio" flags="b" />
 		<key id="KEY_AUDIO" mapto="audio" flags="b" />
+		<key id="KEY_INFO" mapto="epg" flags="m" />
+		<key id="KEY_EPG" mapto="epg" flags="m" />
 	</map>
 
 	<map context="TimerEditActions">
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 43431d5d0aa..b0183cf6d10 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2721,6 +2721,7 @@ def __init__(self, session, title, currentBouquet=False, returnBouquet=False, se
 			{
 				"cancel": self.close,
 				"ok": self.channelSelected,
+				"epg": self.channelSelected,
 				"keyRadio": self.setModeRadio,
 				"keyTV": self.setModeTv,
 				"toggleTvRadio": self.toggleTVRadio,