diff --git a/i3lock.c b/i3lock.c
index 13adc2b..fd4d1d2 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -445,6 +445,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
             return;
         default:
             skip_repeated_empty_password = false;
+            // A new password is being entered, but a previous one is pending.
+            // Discard the old one and clear the retry_verification flag.
+            if (retry_verification) {
+                retry_verification = false;
+                clear_input();
+            }
     }
 
     switch (ksym) {