diff --git a/firmware/applications/tester/util.c b/firmware/applications/tester/util.c
index 02240b0..1d2a49c 100644
--- a/firmware/applications/tester/util.c
+++ b/firmware/applications/tester/util.c
@@ -74,7 +74,8 @@ void msc_menu(void){
     DoString(0,8,"MSC Enabled.");
     lcdDisplay();
     usbMSCInit();
-    while(!getInputRaw())delayms(10);
+    getInputWaitRelease();
+    getInputWait();
     DoString(0,16,"MSC Disabled.");
     usbMSCOff();
 };
diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c
index 3170315..4758d65 100644
--- a/firmware/basic/menu.c
+++ b/firmware/basic/menu.c
@@ -76,6 +76,7 @@ void handleMenu(const struct MENU *the_menu) {
                 lcdClear();
                 lcdPrintln("Called...");
                 lcdRefresh();
+                getInputWaitRelease();
                 if (the_menu->entries[menuselection]->callback!=NULL)
                     the_menu->entries[menuselection]->callback();
                 lcdDisplay();
@@ -86,6 +87,7 @@ void handleMenu(const struct MENU *the_menu) {
                 /* no button pressed */
                 break;
         }
+        getInputWaitRelease();
 
     }
     return;