diff --git a/source/config.c b/source/config.c
index f544a84..3e5f372 100644
--- a/source/config.c
+++ b/source/config.c
@@ -202,6 +202,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 ccdedcf..386abcc 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -147,6 +147,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 84985ba..d22fbd3 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