diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index 62d8666f5..aca7541e5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.mainwindow;
 
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -22,6 +23,7 @@ public class VaultListController implements FxController {
 
 	private final ObservableList<Vault> vaults;
 	private final ObjectProperty<Vault> selectedVault;
+	private final BooleanBinding noVaultSelected;
 	private final VaultListCellFactory cellFactory;
 	private final AddVaultWizardComponent.Builder addVaultWizard;
 	private final RemoveVaultComponent.Builder removeVault;
@@ -35,6 +37,7 @@ public class VaultListController implements FxController {
 		this.cellFactory = cellFactory;
 		this.addVaultWizard = addVaultWizard;
 		this.removeVault = removeVault;
+		this.noVaultSelected = selectedVault.isNull();
 	}
 
 	public void initialize() {
@@ -63,4 +66,14 @@ public class VaultListController implements FxController {
 			LOG.debug("Cannot remove a vault if none is selected.");
 		}
 	}
+
+	// Getter and Setter
+
+	public BooleanBinding noVaultSelectedProperty() {
+		return noVaultSelected;
+	}
+
+	public boolean isNoVaultSelected() {
+		return noVaultSelected.get();
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index 25ee56c8c..f0dc86d89 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ContextMenu?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
@@ -15,7 +17,17 @@
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListController"
 	  minWidth="206">
 	<StackPane VBox.vgrow="ALWAYS">
-		<ListView fx:id="vaultList" editable="true"/>
+		<ListView fx:id="vaultList" editable="true">
+			<contextMenu>
+				<ContextMenu fx:id="test">
+					<!-- TODO: add style class to contextmenu & its entries -->
+					<items>
+						<MenuItem text="%main.vaultlist.contextMenu.add" onAction="#didClickAddVault"/>
+						<MenuItem text="%main.vaultlist.contextMenu.remove" onAction="#didClickRemoveVault" disable="${controller.noVaultSelected}"/>
+					</items>
+				</ContextMenu>
+			</contextMenu>
+		</ListView>
 		<AnchorPane fx:id="onboardingOverlay">
 			<HBox AnchorPane.leftAnchor="10" AnchorPane.rightAnchor="10" AnchorPane.bottomAnchor="100" alignment="BOTTOM_LEFT">
 				<Label textAlignment="CENTER" text="%main.vaultlist.emptyList.onboardingInstruction" wrapText="true"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index f57fe1964..013968acd 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -104,6 +104,8 @@ main.closeBtn.tooltip=Close
 main.preferencesBtn.tooltip=Preferences
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Click here to add a vault
+main.vaultlist.contextMenu.add=Add Vault
+main.vaultlist.contextMenu.remove=Remove Vault
 ## Vault Detail
 main.vaultDetail.lockedStatus=LOCKED
 main.vaultDetail.unlockedStatus=UNLOCKED