diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index b51ddd124..9c1a8fe83 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -459,6 +459,7 @@ public class MainController implements ViewController {
 
 	public void didUpgrade() {
 		showUnlockView();
+		activeController.get().focus();
 	}
 
 	private void showUnlockView() {
@@ -486,6 +487,7 @@ public class MainController implements ViewController {
 	public void didLock(UnlockedController ctrl) {
 		unlockedVaults.remove(ctrl.getVault());
 		showUnlockView();
+		activeController.get().focus();
 	}
 
 	private void showChangePasswordView() {
@@ -498,6 +500,7 @@ public class MainController implements ViewController {
 
 	public void didChangePassword() {
 		showUnlockView();
+		activeController.get().focus();
 	}
 
 }