diff --git a/source/config.c b/source/config.c
index 935ccdb0..f6e50971 100644
--- a/source/config.c
+++ b/source/config.c
@@ -313,6 +313,8 @@ void configMenu(bool isSdMode, bool oldPinStatus, u32 oldPinMode)
                         pressed = BUTTON_UP;
                         selectedOption = totalIndexes;
                         break;
+                    default:
+                        break;
                 }
 
                 if(selectedOption < multiOptionsAmount)
diff --git a/source/fs.c b/source/fs.c
index 9641bbde..60d91cb0 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -228,7 +228,7 @@ void payloadMenu(void)
             u32 pressed = 0,
                 selectedPayload = 0;
 
-            while(!(pressed & (BUTTON_A | BUTTON_START)))
+            while(pressed != BUTTON_A && pressed != BUTTON_START)
             {
                 do
                 {