diff --git a/source/config.c b/source/config.c
index 38fd72c0..ef89d002 100644
--- a/source/config.c
+++ b/source/config.c
@@ -205,6 +205,4 @@ void configureCFW(const char *configPath)
 
     //Wait for the pressed buttons to change
     while(HID_PAD == BUTTON_START);
-
-    chrono(2);
 }
\ No newline at end of file
diff --git a/source/firm.c b/source/firm.c
index b678a49f..e6f409f3 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -151,6 +151,8 @@ void main(void)
 
                 if(!pinExists && CONFIG(7)) pin = newPin();
 
+                chrono(2);
+
                 //Update pressed buttons
                 pressed = HID_PAD;
             }
diff --git a/source/pin.c b/source/pin.c
index 84985bad..d22fbd39 100644
--- a/source/pin.c
+++ b/source/pin.c
@@ -168,4 +168,6 @@ void verifyPin(PINData *in, bool allowQuit)
             else break;
         }
     }
+
+    while(HID_PAD & PIN_BUTTONS);
 }
\ No newline at end of file