diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 6baf3668d..811ad1c89 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2403,7 +2403,8 @@ timing.chanlist Kanalliste
 timing.epg EPG
 timing.filebrowser Filebrowser
 timing.infobar Infobar
-timing.infobar_movieplayer Infobar (Filmwiedergabe)
+timing.infobar_media_audio Infobar (Mediaplayer Audio)
+timing.infobar_media_video Infobar (Mediaplayer Video)
 timing.infobar_radio Infobar (Radiobetrieb)
 timing.menu Menü
 timing.numericzap Umschalten mit Zifferntasten
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 49cbe0a51..1aef8b163 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2403,7 +2403,8 @@ timing.chanlist Channellist
 timing.epg Epg
 timing.filebrowser Filebrowser
 timing.infobar Infobar
-timing.infobar_movieplayer Infobar (movie mode)
+timing.infobar_media_audio Infobar (Mediaplayer audio)
+timing.infobar_media_video Infobar (Mediaplayer video)
 timing.infobar_radio Infobar (radio mode)
 timing.menu Menu
 timing.numericzap Numeric Zap
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 113cfde72..b7d82a883 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -925,7 +925,10 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
 				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
 				break;
 		case NeutrinoModes::mode_ts:
-				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext);
+				if (CMoviePlayerGui::getInstance().IsAudioPlayer())
+					timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext);
+				else
+					timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext);
 				break;
 		case NeutrinoModes::mode_tv:
 		case NeutrinoModes::mode_webtv:
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 6266d3a1d..4c65a8a0a 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -270,6 +270,7 @@ class CMoviePlayerGui : public CMenuTarget
 	void setLuaInfoFunc(lua_State* L, bool func) { luaState = L; haveLuaInfoFunc = func; };
 	void getLivestreamInfo(std::string *i1, std::string *i2) { *i1=livestreamInfo1; *i2=livestreamInfo2; };
 	bool getLiveUrl(const std::string &url, const std::string &script, std::string &realUrl, std::string &_pretty_name, std::string &info1, std::string &info2, std::string &header);
+	bool IsAudioPlayer() { return is_audio_player; };
 };
 
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 25c1f13a1..b4a9c3cda 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -5170,6 +5170,7 @@ static struct __key_rename key_rename[] = {
 	{ "screen_StartY_lcd",	"screen_StartY_lcd_0" },
 	{ "screen_EndX_lcd",	"screen_EndX_lcd_0" },
 	{ "screen_EndY_lcd",	"screen_EndY_lcd_0" },
+	{ "timing.infobar_movieplayer",	"timing.infobar_media_video" },
 	{ NULL, NULL }
 };
 
diff --git a/src/system/locals.h b/src/system/locals.h
index d7926147b..32e30f6bc 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2429,7 +2429,8 @@ typedef enum
 	LOCALE_TIMING_EPG,
 	LOCALE_TIMING_FILEBROWSER,
 	LOCALE_TIMING_INFOBAR,
-	LOCALE_TIMING_INFOBAR_MOVIEPLAYER,
+	LOCALE_TIMING_INFOBAR_MEDIA_AUDIO,
+	LOCALE_TIMING_INFOBAR_MEDIA_VIDEO,
 	LOCALE_TIMING_INFOBAR_RADIO,
 	LOCALE_TIMING_MENU,
 	LOCALE_TIMING_NUMERICZAP,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 0882affd5..fb22835f7 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2429,7 +2429,8 @@ const char * locale_real_names[] =
 	"timing.epg",
 	"timing.filebrowser",
 	"timing.infobar",
-	"timing.infobar_movieplayer",
+	"timing.infobar_media_audio",
+	"timing.infobar_media_video",
 	"timing.infobar_radio",
 	"timing.menu",
 	"timing.numericzap",
diff --git a/src/system/settings.h b/src/system/settings.h
index 3921d24aa..1fe6fe5bd 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -413,17 +413,18 @@ struct SNeutrinoSettings
 	//timing
 	enum TIMING_SETTINGS 
 	{
-		TIMING_MENU		= 0,
-		TIMING_CHANLIST		= 1,
-		TIMING_EPG		= 2,
-		TIMING_INFOBAR		= 3,
-		TIMING_INFOBAR_RADIO	= 4,
-		TIMING_INFOBAR_MOVIE	= 5,
-		TIMING_VOLUMEBAR	= 6,
-		TIMING_FILEBROWSER	= 7,
-		TIMING_NUMERICZAP	= 8,
-		TIMING_POPUP_MESSAGES	= 9,
-		TIMING_STATIC_MESSAGES	= 10,
+		TIMING_MENU = 0,
+		TIMING_CHANLIST,
+		TIMING_EPG,
+		TIMING_INFOBAR,
+		TIMING_INFOBAR_RADIO,
+		TIMING_INFOBAR_MEDIA_AUDIO,
+		TIMING_INFOBAR_MEDIA_VIDEO,
+		TIMING_VOLUMEBAR,
+		TIMING_FILEBROWSER,
+		TIMING_NUMERICZAP,
+		TIMING_POPUP_MESSAGES,
+		TIMING_STATIC_MESSAGES,
 
 		TIMING_SETTING_COUNT
 	};
@@ -911,7 +912,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
 	{ 240,	LOCALE_TIMING_EPG,			LOCALE_MENU_HINT_OSD_TIMING},
 	{ 6,	LOCALE_TIMING_INFOBAR,			LOCALE_MENU_HINT_OSD_TIMING},
 	{ 0,	LOCALE_TIMING_INFOBAR_RADIO,		LOCALE_MENU_HINT_OSD_TIMING},
-	{ 6,	LOCALE_TIMING_INFOBAR_MOVIEPLAYER,	LOCALE_MENU_HINT_OSD_TIMING},
+	{ 0,	LOCALE_TIMING_INFOBAR_MEDIA_AUDIO,	LOCALE_MENU_HINT_OSD_TIMING},
+	{ 6,	LOCALE_TIMING_INFOBAR_MEDIA_VIDEO,	LOCALE_MENU_HINT_OSD_TIMING},
 	{ 3,	LOCALE_TIMING_VOLUMEBAR,		LOCALE_MENU_HINT_OSD_TIMING},
 	{ 60,	LOCALE_TIMING_FILEBROWSER,		LOCALE_MENU_HINT_OSD_TIMING},
 	{ 3,	LOCALE_TIMING_NUMERICZAP,		LOCALE_MENU_HINT_OSD_TIMING},