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