diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c3de21053..96211b65e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3262,8 +3262,7 @@ define([
             ]),
         ]);
         UI.errorLoadingScreen(block, Boolean(cfg.loaded), Boolean(cfg.loaded));
-
-        $password.find('.cp-password-input').focus();
+        UI.addTabListener(block);
     };
 
     UIElements.displayBurnAfterReadingPage = function (common, cb) {