diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 448bcdaad..14b9ec252 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1116,8 +1116,15 @@ void menuModelSetup(event_t event)
           if (menuHorizontalPosition == 0) {
             if (event == EVT_KEY_BREAK(KEY_ENTER)) {
               moduleSettings[INTERNAL_MODULE].mode ^= MODULE_MODE_BIND;
+              reusableBuffer.modelsetup.pxx2_bind_receiver_index = receiverIdx;
+            }
+            if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_BIND) {
+              s_editMode = 1;
+              // TODO the menu here
+            }
+            else {
+              s_editMode = 0;
             }
-            s_editMode = (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_BIND);
           }
           else if (menuHorizontalPosition == 1 && s_editMode > 0) {
             if (receiverIdx == 0) {