diff --git a/www/LoginView.js b/www/LoginView.js
index 291f95d6..4b101425 100644
--- a/www/LoginView.js
+++ b/www/LoginView.js
@@ -338,6 +338,7 @@ Ext.define('PBS.login.TfaWindow', {
 		    // non-visible tab, so we can just directly use the valid param
 		    this.getViewModel().set('canConfirm', valid);
 		},
+		afterrender: field => field.focus(), // ensure focus after initial render
 	    },
 	},