diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 141bf8498..d094d980a 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1777,6 +1777,7 @@ 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 e577feb52..f437693dd 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1777,6 +1777,7 @@ 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 50d4fae5b..c516b7974 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -38,6 +38,7 @@
 #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>
@@ -647,7 +648,11 @@ void CMoviePlayerGui::PlayFile(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) {
-			playstate = CMoviePlayerGui::STOPPED;
+			bool stop_it = true;
+			if ((timeshift) && (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;
 			if ((duration - position) > 600000)
 				makeScreenShot(true);
 		} else if (msg == (neutrino_msg_t) g_settings.mpkey_play) {
diff --git a/src/system/locals.h b/src/system/locals.h
index cb9befd0e..2dd563ca1 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1804,6 +1804,7 @@ 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 5d29c4560..d6b783cb8 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1804,6 +1804,7 @@ 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",