diff --git a/nanovna.h b/nanovna.h
index 0b0f647..ac84335 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -370,7 +370,7 @@ extern uint16_t graph_bottom;
 #define FORM_BUTTON_BORDER      2
 
 // Form button (at center screen better be less LCD_WIDTH - 2*OFFSETX)
-#define MENU_FORM_WIDTH    256
+#define MENU_FORM_WIDTH    (LCD_WIDTH - 2*OFFSETX)
 
 // Num Input height at bottom
 #define NUM_INPUT_HEIGHT   32
diff --git a/ui.c b/ui.c
index 5f1af56..32a591c 100644
--- a/ui.c
+++ b/ui.c
@@ -2587,6 +2587,7 @@ touch_lever_mode_select(void)
       else
         ui_mode_keypad(KM_START);
       ui_process_keypad();
+      return TRUE;
     }
     if (touch_x >  FREQUENCIES_XPOS2 - 50 && touch_x <  FREQUENCIES_XPOS2 +50) {
       touch_wait_release();
@@ -2604,8 +2605,10 @@ touch_lever_mode_select(void)
       else
         ui_mode_keypad(KM_STOP);
       ui_process_keypad();
+      return TRUE;
     }
     select_lever_mode(touch_x < FREQUENCIES_XPOS2 ? LM_CENTER : LM_SPAN);
+    touch_wait_release();
     return TRUE;
   }
   if (touch_x <OFFSETX)