diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index e0d8ad457c..a50b2f1921 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -166,6 +166,7 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
 
     /* make sure to eat any extranous keypresses */
     action_wait_for_release();
+    button_clear_queue();
 
     while (result==-1)
     {