diff --git a/firmware/target/arm/rk27xx/system-rk27xx.c b/firmware/target/arm/rk27xx/system-rk27xx.c
index 9dc4a5e664..1b4505541f 100644
--- a/firmware/target/arm/rk27xx/system-rk27xx.c
+++ b/firmware/target/arm/rk27xx/system-rk27xx.c
@@ -22,6 +22,7 @@
 #include "kernel.h"
 #include "system.h"
 #include "panic.h"
+#include "button.h"
 #include "system-target.h"
 
 #define default_interrupt(name) \
@@ -166,7 +167,10 @@ void system_reboot(void)
 
 void system_exception_wait(void)
 {
-    while(1);
+    /* wait until button release (if a button is pressed) */
+    while(button_read_device());
+    /* then wait until next button press */
+    while(!button_read_device());
 }
 
 int system_memory_guard(int newmode)