diff --git a/radio/src/gui/common/stdlcd/model_receiver_options.cpp b/radio/src/gui/common/stdlcd/model_receiver_options.cpp
index ea1c49115..001d7045a 100644
--- a/radio/src/gui/common/stdlcd/model_receiver_options.cpp
+++ b/radio/src/gui/common/stdlcd/model_receiver_options.cpp
@@ -62,6 +62,17 @@ void menuModelReceiverOptions(event_t event)
     reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount = 8;
 #endif
   }
+  else if (menuEvent) {
+    killEvents(KEY_EXIT);
+    moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
+    if (reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
+      abortPopMenu();
+      POPUP_CONFIRMATION(STR_UPDATE_RX_OPTIONS, onRxOptionsUpdateConfirm);
+    }
+    else {
+      return;
+    }
+  }
 
   uint8_t receiverId = reusableBuffer.hardwareAndSettings.receiverSettings.receiverId;
   uint8_t modelId = reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.modelID;
@@ -82,18 +93,6 @@ void menuModelReceiverOptions(event_t event)
       moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.hardwareAndSettings.modules[g_moduleIdx], receiverId, receiverId);
   }
 
-  if (menuEvent) {
-    killEvents(KEY_EXIT);
-    moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
-    if (reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
-      abortPopMenu();
-      POPUP_CONFIRMATION(STR_UPDATE_RX_OPTIONS, onRxOptionsUpdateConfirm);
-    }
-    else {
-      return;
-    }
-  }
-
   if (event == EVT_KEY_LONG(KEY_ENTER) && reusableBuffer.hardwareAndSettings.receiverSettings.dirty) {
     killEvents(event);
     reusableBuffer.hardwareAndSettings.receiverSettings.dirty = 0;