1 files changed, 8 insertions, 1 deletions
diff --git a/src/system_fsm/running.cpp b/src/system_fsm/running.cpp
index 9e250c9b..3fc5493f 100644
--- a/src/system_fsm/running.cpp
+++ b/src/system_fsm/running.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "app_console.hpp"
+#include "audio_events.hpp"
 #include "file_gatherer.hpp"
 #include "freertos/projdefs.h"
 #include "result.hpp"
@@ -68,7 +69,13 @@ void Running::exit() {
 }
 
 void Running::react(const KeyLockChanged& ev) {
-  if (!ev.falling && audio::AudioState::is_in_state<audio::states::Standby>()) {
+  if (IdleCondition()) {
+    transit<Idle>();
+  }
+}
+
+void Running::react(const audio::PlaybackFinished& ev) {
+  if (IdleCondition()) {
     transit<Idle>();
   }
 }