diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index 12bfc3e20..5c2eae786 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -1274,7 +1274,9 @@ void CRecordManager::StartTimeshift()
 		if(res)
 		{
 			CMoviePlayerGui::getInstance().exec(NULL, tmode);
-			if(g_settings.temp_timeshift && !g_settings.auto_timeshift && autoshift)
+			if(g_settings.temp_timeshift)
+				Stop(live_channel_id);
+			else if (!(g_settings.auto_timeshift && autoshift))
 				ShowMenu();
 		}
 	}