diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 24e954a47..c63d8f705 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1375,7 +1375,7 @@ void menuModelSetup(event_t event)
 
         if (attr && EVT_KEY_MASK(event) == KEY_ENTER) {
           killEvents(event);
-          if (!isSimu() && isPXX2ReceiverEmpty(moduleIdx, receiverIdx)) {
+          if (isPXX2ReceiverEmpty(moduleIdx, receiverIdx)) {
             onPXX2ReceiverMenu(STR_BIND);
           }
           else {
diff --git a/radio/src/gui/common/stdlcd/model_receiver_options.cpp b/radio/src/gui/common/stdlcd/model_receiver_options.cpp
index 50f9446df..ed4dbcd48 100644
--- a/radio/src/gui/common/stdlcd/model_receiver_options.cpp
+++ b/radio/src/gui/common/stdlcd/model_receiver_options.cpp
@@ -62,7 +62,7 @@ void menuModelReceiverOptions(event_t event)
   auto outputsCount = min<uint8_t>(16, reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount);
 
   if (event == EVT_ENTRY) {
-    memclear(&reusableBuffer.hardwareAndSettings, sizeof(reusableBuffer.hardwareAndSettings));
+    // reusableBuffer.hardwareSettings should have been cleared before calling this menu
 #if defined(SIMU)
     reusableBuffer.hardwareAndSettings.receiverSettings.state = PXX2_SETTINGS_OK;
     reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount = 8;
@@ -123,7 +123,7 @@ void menuModelReceiverOptions(event_t event)
 
   int8_t sub = menuVerticalPosition;
   lcdDrawTextAlignedLeft(0, STR_RECEIVER_OPTIONS);
-  drawReceiverName(FW * 13, 0, g_moduleIdx, reusableBuffer.hardwareAndSettings.receiverSettings.receiverId);
+  drawReceiverName(lcdNextPos + FW, 0, g_moduleIdx, reusableBuffer.hardwareAndSettings.receiverSettings.receiverId);
   lcdInvertLine(0);
 
   if (reusableBuffer.hardwareAndSettings.receiverSettings.state == PXX2_SETTINGS_OK) {