diff --git a/app/templates/downloadPassword.js b/app/templates/downloadPassword.js
index dea30a03..fd8e4848 100644
--- a/app/templates/downloadPassword.js
+++ b/app/templates/downloadPassword.js
@@ -22,7 +22,8 @@ module.exports = function(state, emit) {
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
           oninput=${inputChanged}
-          type="password"/>
+          type="password"
+          autofocus />
         <input type="submit"
           id="unlock-btn"
           class="btn btn-hidden"