diff --git a/apps/tree.c b/apps/tree.c
index c9f5847ab8..ca2cc84be7 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -485,7 +485,7 @@ static bool ask_resume(bool ask_once)
                 /* Handle sys events, ignore button releases */
             default:
                 if(default_event_handler(button) == SYS_USB_CONNECTED ||
-                   (!(button & SYS_EVENT) && !(button & BUTTON_REL)))
+                   (IS_SYSEVENT(button) && !(button & BUTTON_REL)))
                     stop = true;
                 break;
         }
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 7b76e74e18..ed535c6d20 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -91,4 +91,6 @@ extern void mutex_lock(struct mutex *m);
 extern void mutex_unlock(struct mutex *m);
 extern void tick_start(unsigned int interval_in_ms);
 
+#define IS_SYSEVENT(ev) ((ev & SYS_EVENT) == SYS_EVENT)
+
 #endif