diff --git a/source/config.c b/source/config.c
index d8b8c98..aac2d9e 100644
--- a/source/config.c
+++ b/source/config.c
@@ -288,6 +288,8 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
         }
         while(!(pressed & MENU_BUTTONS));
 
+        pressed &= MENU_BUTTONS;
+
         if(pressed == BUTTON_START) break;
 
         if(pressed != BUTTON_A)
diff --git a/source/fs.c b/source/fs.c
index 90c70ec..d762ea5 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -208,6 +208,8 @@ bool payloadMenu(char *path)
             }
             while(!(pressed & MENU_BUTTONS));
 
+            pressed &= MENU_BUTTONS;
+
             u32 oldSelectedPayload = selectedPayload;
 
             switch(pressed)