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..6549f78ee 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
@@ -231,6 +231,9 @@ public class MainController extends AbstractFXMLViewController {
 	@FXML
 	private void didClickRemoveSelectedEntry(ActionEvent e) {
 		vaults.remove(selectedVault.get());
+		if (vaults.isEmpty()) {
+			activeController.set(welcomeController.get());
+		}
 	}
 
 	@FXML