diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 946abbdcf..e44d707d8 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2334,6 +2334,7 @@ settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.
 shoutcast.dev_id SHOUTcast Dev ID
 shoutcast.enabled SHOUTcast-Unterstützung
 shutdown.recording_query Aufnahme läuft. Trotzdem beenden?
+shutdown.timeshift_query Timeshift läuft. Trotzdem beenden?
 shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen?
 sleeptimerbox.announce Die Box wird in 1 Min. in Standby-Betrieb gehen.\nStandby-Betrieb abbrechen?
 sleeptimerbox.hint1 Ausschaltzeit in Minuten (000 = aus)
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 8d6514b2a..f1ef0c610 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2334,6 +2334,7 @@ settings.restore_warn This will replace all settings and reboot\nContinue ?
 shoutcast.dev_id SHOUTcast Dev ID
 shoutcast.enabled SHOUTcast support
 shutdown.recording_query You really want to to stop record ?
+shutdown.timeshift_query You really want to to stop timeshift ?
 shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ?
 sleeptimerbox.announce Box will standby in 1 min.\nCancel Standby ?
 sleeptimerbox.hint1 Shutdown time in minutes (000 = off)
diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index f294caf3d..91a86c661 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -1590,7 +1590,7 @@ bool CRecordManager::AskToStop(const t_channel_id channel_id, const int recid)
 	if(inst == NULL)
 		return false;
 
-	if(ShowMsg(LOCALE_SHUTDOWN_RECORDING_QUERY, title.c_str(),
+	if(ShowMsg(FindTimeshift() ? LOCALE_SHUTDOWN_TIMESHIFT_QUERY : LOCALE_SHUTDOWN_RECORDING_QUERY, title.c_str(),
 				CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes) {
 		mutex.lock();
 		if (recid)
diff --git a/src/system/locals.h b/src/system/locals.h
index 642552918..9b26ad2d1 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2361,6 +2361,7 @@ typedef enum
 	LOCALE_SHOUTCAST_DEV_ID,
 	LOCALE_SHOUTCAST_ENABLED,
 	LOCALE_SHUTDOWN_RECORDING_QUERY,
+	LOCALE_SHUTDOWN_TIMESHIFT_QUERY,
 	LOCALE_SHUTDOWNTIMER_ANNOUNCE,
 	LOCALE_SLEEPTIMERBOX_ANNOUNCE,
 	LOCALE_SLEEPTIMERBOX_HINT1,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index f192aeb80..d6c56708a 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2361,6 +2361,7 @@ const char * locale_real_names[] =
 	"shoutcast.dev_id",
 	"shoutcast.enabled",
 	"shutdown.recording_query",
+	"shutdown.timeshift_query",
 	"shutdowntimer.announce",
 	"sleeptimerbox.announce",
 	"sleeptimerbox.hint1",