diff --git a/app/templates/uploadPassword.js b/app/templates/uploadPassword.js
index 0a70b4c8..84fa7797 100644
--- a/app/templates/uploadPassword.js
+++ b/app/templates/uploadPassword.js
@@ -27,6 +27,9 @@ module.exports = function(state, emit) {
       .getElementById('copy')
       .classList.toggle('wait-password', e.target.checked);
     document.getElementById('copy-btn').disabled = e.target.checked;
+    if (e.target.checked) {
+      document.getElementById('unlock-input').focus();
+    }
   }
 
   function setPassword(event) {