diff --git a/app.py b/app.py
index 19300f0..3d64413 100644
--- a/app.py
+++ b/app.py
@@ -268,6 +268,7 @@ function genPassword() {
   $("#pw-input").value = pw;
   $("#pw-input").type = "text";
   $("#pw-msg").textContent = "Copy this password before setting it.";
+  $("#pw-input").focus();
 }
 
 function removePassword() {