diff --git a/src/password.rs b/src/password.rs
index 5dcf3d573eadcd56a15b805ade3a54d4797433ee..54a62c7c87460b3e7942c165b08c2f41ac192df2 100644
--- a/src/password.rs
+++ b/src/password.rs
@@ -22,7 +22,7 @@ impl Plugin for PasswordPlugin {
                 PostUpdate,
                 (
                     hide_password_text.before(RenderSet).in_set(PasswordSet),
-                    restore_password_text.after(RenderSet),
+                    restore_password_text.before(FocusSet).after(RenderSet),
                 ),
             );
     }