diff --git a/gui.py b/gui.py
index 2a45ae4..8d43e68 100644
--- a/gui.py
+++ b/gui.py
@@ -273,7 +273,7 @@ def onActionOSDMode(self, action):
                 self._showOsd()
 
     def onActionEPGMode(self, action):
-        if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK, ACTION_PREVIOUS_MENU]:
+        if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK]:
             self.close()
             return
 
@@ -327,10 +327,12 @@ def onActionEPGMode(self, action):
             self.viewStartDate -= datetime.timedelta(minutes=self.viewStartDate.minute % 30,
                                                      seconds=self.viewStartDate.second)
             self.onRedrawEPG(self.channelIdx, self.viewStartDate)
-        elif action.getId() in [KEY_CONTEXT_MENU] and controlInFocus is not None:
+        elif action.getId() in [KEY_CONTEXT_MENU, ACTION_PREVIOUS_MENU] and controlInFocus is not None:
             program = self._getProgramFromControl(controlInFocus)
             if program is not None:
                 self._showContextMenu(program)
+        else:
+            xbmc.log('[script.tvguide] Unhandled ActionId: ' + str(action.getId()), xbmc.LOGDEBUG)
 
     @buggalo.buggalo_try_except({'method': 'TVGuide.onClick'})
     def onClick(self, controlId):
diff --git a/streaming.py b/streaming.py
index e657afe..7f654c0 100644
--- a/streaming.py
+++ b/streaming.py
@@ -36,7 +36,7 @@ def __init__(self):
 
     def loadFavourites(self):
         entries = list()
-        path = xbmc.translatePath('special://userdata/favourites.xml')
+        path = xbmc.translatePath(os.path.join('special://profile', 'favourites.xml'))
         if os.path.exists(path):
             f = open(path)
             xml = f.read()