diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c
index d2a81f11..6f2db86c 100644
--- a/openrtx/src/ui/ui.c
+++ b/openrtx/src/ui/ui.c
@@ -1043,6 +1043,18 @@ void ui_updateFSM(bool *sync_rtx)
                         // Open Menu
                         state.ui_screen = MENU_TOP;
                     }
+                    else if(msg.keys & KEY_ESC)
+                    {
+                        // Save VFO channel
+                        state.vfo_channel = state.channel;
+                        int result = _ui_fsm_loadChannel(state.channel_index, sync_rtx);
+                        // Read successful and channel is valid
+                        if(result != -1)
+                        {
+                            // Switch to MEM screen
+                            state.ui_screen = MAIN_MEM;
+                        }
+                    }
                     else if(msg.keys & KEY_HASH)
                     {
                         // Enable dst ID input
@@ -1072,25 +1084,6 @@ void ui_updateFSM(bool *sync_rtx)
                             *sync_rtx = true;
                         }
                     }
-                    else if(msg.keys & KEY_ENTER)
-                    {
-                        // Save current main state
-                        ui_state.last_main_state = state.ui_screen;
-                        // Open Menu
-                        state.ui_screen = MENU_TOP;
-                    }
-                    else if(msg.keys & KEY_ESC)
-                    {
-                        // Save VFO channel
-                        state.vfo_channel = state.channel;
-                        int result = _ui_fsm_loadChannel(state.channel_index, sync_rtx);
-                        // Read successful and channel is valid
-                        if(result != -1)
-                        {
-                            // Switch to MEM screen
-                            state.ui_screen = MAIN_MEM;
-                        }
-                    }
                     else if(input_isNumberPressed(msg))
                     {
                         // Open Frequency input screen