diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 6d5221be2..7012ab795 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -430,8 +430,7 @@ void onBluetoothConnectMenu(const char * result)
     uint8_t index = (result - reusableBuffer.moduleSetup.bt.devices[0]) / sizeof(reusableBuffer.moduleSetup.bt.devices[0]);
     strncpy(bluetooth.distantAddr, reusableBuffer.moduleSetup.bt.devices[index], LEN_BLUETOOTH_ADDR);
     bluetooth.state = BLUETOOTH_STATE_BIND_REQUESTED;
-  }
-  else {
+  } else {
     reusableBuffer.moduleSetup.bt.devicesCount = 0;
     bluetooth.state = BLUETOOTH_STATE_DISCOVER_END;
   }
diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp
index 853c37127..b0cebce59 100644
--- a/radio/src/gui/common/stdlcd/popups.cpp
+++ b/radio/src/gui/common/stdlcd/popups.cpp
@@ -337,8 +337,8 @@ void POPUP_MENU_TITLE(const char * s)
 
 void POPUP_MENU_START(PopupMenuHandler handler)
 {
-  killAllEvents();
   if (handler != popupMenuHandler) {
+    killAllEvents();
     AUDIO_KEY_PRESS();
     popupMenuHandler = handler;
   }