diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 49cd59bf3f..f4be5c8f1a 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -15,7 +15,7 @@
                     <div class="row-main">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
-                               class="monospaced" [(ngModel)]="masterPassword" required appAutofocus>
+                               class="monospaced" [(ngModel)]="masterPassword" required>
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appBlurClick
diff --git a/src/popup/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts
index c8f9b45a76..8079dd6378 100644
--- a/src/popup/accounts/lock.component.ts
+++ b/src/popup/accounts/lock.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ToasterService } from 'angular2-toaster';
@@ -16,7 +19,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent {
+export class LockComponent extends BaseLockComponent implements OnInit {
     constructor(router: Router, analytics: Angulartics2,
         toasterService: ToasterService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
@@ -25,4 +28,10 @@ export class LockComponent extends BaseLockComponent {
             messagingService, userService, cryptoService);
         this.successRoute = '/tabs/current';
     }
+
+    ngOnInit() {
+        window.setTimeout(() => {
+            document.getElementById('masterPassword').focus();
+        }, 100);
+    }
 }