diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 29559fe..eead5fb 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1962,6 +1962,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
        } else if (msg == (neutrino_msg_t) CRCInput::RC_setup) {
            CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::SHOW_MAINMENU, 0);
            update_lcd = true;
+       } else if (msg == (neutrino_msg_t) g_settings.key_zaphistory || msg == (neutrino_msg_t) g_settings.key_current_transponder) {
+           CNeutrinoApp::getInstance()->showChannelList(msg);
        } else if (msg == CRCInput::RC_red || msg == CRCInput::RC_green || msg == CRCInput::RC_yellow || msg == CRCInput::RC_blue ) {
            //maybe move FileTimeOSD->kill to Usermenu to simplify this call
            bool restore = FileTimeOSD->IsVisible();
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 1343e49..8218724 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3424,8 +3424,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
    }

    /* ================================== KEYS ================================================ */
-   if( msg == CRCInput::RC_ok || msg == (neutrino_msg_t) g_settings.key_zaphistory || msg == (neutrino_msg_t) g_settings.key_current_transponder
-           || (!g_InfoViewer->getSwitchMode() && CNeutrinoApp::getInstance()->listModeKey(msg))) {
+   if( msg == CRCInput::RC_ok || (!g_InfoViewer->getSwitchMode() && CNeutrinoApp::getInstance()->listModeKey(msg))) {
        if( (mode == NeutrinoModes::mode_tv) || (mode == NeutrinoModes::mode_radio) || (mode == NeutrinoModes::mode_ts) || (mode == NeutrinoModes::mode_webtv) || (mode == NeutrinoModes::mode_webradio)) {
            showChannelList(msg);
            return messages_return::handled;