diff --git a/firmware/basic/keyin.c b/firmware/basic/keyin.c
index b8be57b..3d7918a 100644
--- a/firmware/basic/keyin.c
+++ b/firmware/basic/keyin.c
@@ -40,7 +40,7 @@ uint8_t getInput(void) {
 uint8_t getInputWait(void) {
     uint8_t key;
     while ((key=getInput())==BTN_NONE)
-        delayms(10);
+        work_queue();
     return key;
 };
 
diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c
index 818972f..3170315 100644
--- a/firmware/basic/menu.c
+++ b/firmware/basic/menu.c
@@ -43,7 +43,7 @@ void handleMenu(const struct MENU *the_menu) {
         }
         lcdDisplay();
 
-        switch (getInput()) {
+        switch (getInputWait()) {
             case BTN_UP:
                 menuselection--;
                 if (menuselection < current_offset) {