diff --git a/jslib b/jslib
index f568c872898..6f6b5a5503b 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f568c872898c86b3cf8b5a99f8b5b377cb5b49e7
+Subproject commit 6f6b5a5503b7aeb7bbd174e3f96a33ce1c9a8037
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 8296ba3aea3..e4c48cfb706 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -8,12 +8,12 @@
                     <div class="row-main" *ngIf="pinLock">
                         <label for="pin">{{'pin' | i18n}}</label>
                         <input id="pin" type="{{showPassword ? 'text' : 'password'}}" name="PIN" class="monospaced"
-                            [(ngModel)]="pin" required appAutofocus>
+                            [(ngModel)]="pin" required>
                     </div>
                     <div class="row-main" *ngIf="!pinLock">
                         <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 role="button"
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index c515a07b3da..c59ccef9156 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -33,6 +33,8 @@ const BroadcasterSubscriptionId = 'LockComponent';
     templateUrl: 'lock.component.html',
 })
 export class LockComponent extends BaseLockComponent implements OnDestroy {
+    private deferFocus: boolean = null;
+
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
@@ -63,10 +65,22 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
+                    case 'windowIsFocused':
+                        if (this.deferFocus === null) {
+                            this.deferFocus = !message.windowIsFocused;
+                            if (!this.deferFocus) {
+                                this.focusInput();
+                            }
+                        } else if (this.deferFocus && message.windowIsFocused) {
+                            this.focusInput();
+                            this.deferFocus = false;
+                        }
+                        break;
                     default:
                 }
             });
         });
+        this.messagingService.send('getWindowIsFocused');
     }
 
     ngOnDestroy() {
@@ -76,4 +90,8 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
     onWindowHidden() {
         this.showPassword = false;
     }
+
+    private focusInput() {
+        document.getElementById(this.pinLock ? 'pin' : 'masterPassword').focus();
+    }
 }
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 46e111ec972..7246f3c258a 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -15,6 +15,7 @@ import { AuthService } from 'jslib-common/abstractions/auth.service';
 import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
 import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { StateService } from 'jslib-common/abstractions/state.service';
@@ -37,12 +38,15 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
 
     showingModal = false;
 
+    private deferFocus: boolean = null;
+
     constructor(authService: AuthService, router: Router, i18nService: I18nService,
         syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
         platformUtilsService: PlatformUtilsService, stateService: StateService,
         environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
         cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
-        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
+        private broadcasterService: BroadcasterService, private ngZone: NgZone,
+        private messagingService: MessagingService) {
         super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
             passwordGenerationService, cryptoFunctionService, storageService);
         super.onSuccessfulLogin = () => {
@@ -58,10 +62,22 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
+                    case 'windowIsFocused':
+                        if (this.deferFocus === null) {
+                            this.deferFocus = !message.windowIsFocused;
+                            if (!this.deferFocus) {
+                                this.focusInput();
+                            }
+                        } else if (this.deferFocus && message.windowIsFocused) {
+                            this.focusInput();
+                            this.deferFocus = false;
+                        }
+                        break;
                     default:
                 }
             });
         });
+        this.messagingService.send('getWindowIsFocused');
     }
 
     ngOnDestroy() {
diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 98c3ba9eedb..cfae0842e49 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -60,6 +60,9 @@ export class MessagingMain {
             case 'setFocus':
                 this.setFocus();
                 break;
+            case 'getWindowIsFocused':
+                this.windowIsFocused();
+                break;
             case 'enableBrowserIntegration':
                 this.main.nativeMessagingMain.generateManifests();
                 this.main.nativeMessagingMain.listen();
@@ -139,4 +142,12 @@ Terminal=false`;
         this.main.trayMain.restoreFromTray();
         this.main.windowMain.win.focusOnWebView();
     }
+
+    private windowIsFocused() {
+        const windowIsFocused = this.main.windowMain.win.isFocused();
+        this.main.windowMain.win.webContents.send('messagingService', {
+            command: 'windowIsFocused',
+            windowIsFocused: windowIsFocused,
+        });
+    }
 }