diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
index 534832653..b4d6ba041 100644
--- a/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
+++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvbackend.cpp
@@ -75,10 +75,11 @@ LibMpvBackend::LibMpvBackend(QWidget* parent)
   mpv_set_option_string(m_mpvHandle, "osd-playing-msg", "${media-title}");
   mpv_set_option_string(m_mpvHandle, "osc", "yes");
   mpv_set_option_string(m_mpvHandle, "input-cursor", "yes");
-  mpv_set_option_string(m_mpvHandle, "keep-open", "no");
+  // mpv_set_option_string(m_mpvHandle, "keep-open", "no");
   mpv_set_option_string(m_mpvHandle, "idle", "yes");
   mpv_set_option_string(m_mpvHandle, "save-position-on-quit", "no");
   mpv_set_option_string(m_mpvHandle, "no-resume-playback", "yes");
+
 #if !defined(NDEBUG)
   mpv_set_option_string(m_mpvHandle, "terminal", "yes");
 #endif
@@ -142,6 +143,7 @@ void LibMpvBackend::handleMpvEvent(mpv_event* event) {
 
     case MPV_EVENT_FILE_LOADED:
       emit statusChanged(tr("File loaded"));
+      emit playbackStateChanged(PlayerBackend::PlaybackState::PlayingState);
       break;
 
     case MPV_EVENT_END_FILE: {
@@ -265,8 +267,12 @@ void LibMpvBackend::onMpvEvents() {
 
 void LibMpvBackend::processEndFile(mpv_event_end_file* end_file) {
   switch (end_file->reason) {
-    case MPV_END_FILE_REASON_EOF:
     case MPV_END_FILE_REASON_STOP:
+      emit statusChanged(tr("Stopped"));
+      emit playbackStateChanged(PlayerBackend::PlaybackState::StoppedState);
+      break;
+
+    case MPV_END_FILE_REASON_EOF:
     case MPV_END_FILE_REASON_QUIT:
       emit statusChanged(tr("File ended"));
       emit playbackStateChanged(PlayerBackend::PlaybackState::StoppedState);
@@ -474,12 +480,20 @@ void LibMpvBackend::playUrl(const QUrl& url) {
 }
 
 void LibMpvBackend::playPause() {
-  int paused;
-  mpv_get_property(m_mpvHandle, "pause", MPV_FORMAT_FLAG, &paused);
+  int idle;
+  mpv_get_property(m_mpvHandle, "idle-active", MPV_FORMAT_FLAG, &idle);
 
-  paused = paused == 0 ? 1 : 0;
+  if (idle) {
+    playUrl(m_url);
+  }
+  else {
+    int paused;
+    mpv_get_property(m_mpvHandle, "pause", MPV_FORMAT_FLAG, &paused);
 
-  mpv_set_property_async(m_mpvHandle, EVENT_CODE_PAUSE, "pause", MPV_FORMAT_FLAG, &paused);
+    paused = paused == 0 ? 1 : 0;
+
+    mpv_set_property_async(m_mpvHandle, EVENT_CODE_PAUSE, "pause", MPV_FORMAT_FLAG, &paused);
+  }
 }
 
 void LibMpvBackend::pause() {
diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.cpp b/src/librssguard/gui/mediaplayer/mediaplayer.cpp
index 05053a2f1..128d53e0a 100644
--- a/src/librssguard/gui/mediaplayer/mediaplayer.cpp
+++ b/src/librssguard/gui/mediaplayer/mediaplayer.cpp
@@ -132,8 +132,12 @@ void MediaPlayer::onDurationChanged(int duration) {
 }
 
 void MediaPlayer::updateTimeAndProgress(int progress, int total) {
-  m_ui.m_lblTime->setText(QSL("%1/%2").arg(QDateTime::fromSecsSinceEpoch(progress).toUTC().toString("hh:mm:ss"),
-                                           QDateTime::fromSecsSinceEpoch(total).toUTC().toString("hh:mm:ss")));
+  static QString format_hours = QSL("hh:mm:ss");
+  static QString format_minutes = QSL("mm:ss");
+  QString format = total >= 3600 ? format_hours : format_minutes;
+
+  m_ui.m_lblTime->setText(QSL("%1/%2").arg(QDateTime::fromSecsSinceEpoch(progress).toUTC().toString(format),
+                                           QDateTime::fromSecsSinceEpoch(total).toUTC().toString(format)));
 }
 
 void MediaPlayer::onErrorOccurred(const QString& error_string) {