diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index 519b2ecb9..ad78aed15 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -438,7 +438,13 @@ void guiMain(event_t evt)
     menuEvent = 0;
   }
 
-  handleGui(isEventCaughtByPopup() ? 0 : evt);
+  if (isEventCaughtByPopup()) {
+    handleGui(0);
+  }
+  else {
+    handleGui(evt);
+    evt = 0;
+  }
 
   if (warningText) {
     // show warning on top of the normal menus