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 38abb0e45..b492514a7 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
@@ -260,8 +260,9 @@ public class MainController extends AbstractFXMLViewController {
 
 	private void selectedVaultDidChange(Vault newValue) {
 		if (newValue == null) {
-			activeController.set(welcomeController.get());
-		} else if (newValue.isUnlocked()) {
+			return;
+		}
+		if (newValue.isUnlocked()) {
 			this.showUnlockedView(newValue);
 		} else if (newValue.isValidVaultDirectory()) {
 			this.showUnlockView();