diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 5e70efeb8..6ee1a7501 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1886,7 +1886,6 @@ recordingmenu.multimenu.info_stop_all %d von %d Aufnahmen werden beendet.
 recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal
 recordingmenu.multimenu.stop_all Alle Aufnahmen beenden
 recordingmenu.multimenu.timeshift Timeshift
-recordingmenu.multimenu.timeshift.stop Zeitversetztes Fernsehen beenden?
 recordingmenu.off aus
 recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar!
 recordingmenu.record_is_running Aufnahme läuft!
diff --git a/data/locale/english.locale b/data/locale/english.locale
index ddfa94eca..a1b45d66f 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1882,7 +1882,6 @@ recordingmenu.multimenu.info_stop_all %d of %d recordings will be stopped.
 recordingmenu.multimenu.rec_akt record current channel
 recordingmenu.multimenu.stop_all stop all recordings
 recordingmenu.multimenu.timeshift Timeshift
-recordingmenu.multimenu.timeshift.stop Stop timeshift?
 recordingmenu.off off
 recordingmenu.record_is_not_running No record is running!
 recordingmenu.record_is_running Record is running!
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index ab14bd80d..deb85e5af 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -38,7 +38,6 @@
 #include <gui/widget/helpbox.h>
 #include <gui/infoclock.h>
 #include <gui/plugins.h>
-#include <gui/widget/messagebox.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/abstime.h>
@@ -843,12 +842,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 		if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) {
 			g_PluginList->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
-			bool stop_it = true;
-			if ((timeshift != TSHIFT_MODE_OFF) && (g_settings.temp_timeshift))
-				stop_it = (ShowMsg(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT_STOP, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes);
-			if (stop_it)
-				playstate = CMoviePlayerGui::STOPPED;
-
+			playstate = CMoviePlayerGui::STOPPED;
 			ClearQueue();
 		} else if ((filelist.size() > 0 && msg == (neutrino_msg_t) CRCInput::RC_right)) {
 			if (filelist_it < (filelist.end() - 1)) {
diff --git a/src/system/locals.h b/src/system/locals.h
index 4c462cbfe..d417aa5e6 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1909,7 +1909,6 @@ typedef enum
 	LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT,
 	LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL,
 	LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT,
-	LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT_STOP,
 	LOCALE_RECORDINGMENU_OFF,
 	LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING,
 	LOCALE_RECORDINGMENU_RECORD_IS_RUNNING,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index e319b50a7..26017f4cc 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1909,7 +1909,6 @@ const char * locale_real_names[] =
 	"recordingmenu.multimenu.rec_akt",
 	"recordingmenu.multimenu.stop_all",
 	"recordingmenu.multimenu.timeshift",
-	"recordingmenu.multimenu.timeshift.stop",
 	"recordingmenu.off",
 	"recordingmenu.record_is_not_running",
 	"recordingmenu.record_is_running",