diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSelectMasterkeyFileController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSelectMasterkeyFileController.java
index 656f39b6d..68c63067c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSelectMasterkeyFileController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSelectMasterkeyFileController.java
@@ -8,8 +8,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
@@ -24,7 +22,6 @@ public class UnlockSelectMasterkeyFileController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UnlockSelectMasterkeyFileController.class);
 
-	private final BooleanProperty proceedButtonDisabled = new SimpleBooleanProperty();
 	private final Stage window;
 	private final AtomicReference<Path> masterkeyPath;
 	private final UserInteractionLock<MasterkeyFileProvision> masterkeyFileProvisionLock;
@@ -66,11 +63,4 @@ public class UnlockSelectMasterkeyFileController implements FxController {
 		}
 	}
 
-	public BooleanProperty proceedButtonDisabledProperty() {
-		return proceedButtonDisabled;
-	}
-
-	public boolean isProceedButtonDisabled() {
-		return proceedButtonDisabled.get();
-	}
 }
diff --git a/main/ui/src/main/resources/fxml/unlock_select_masterkeyfile.fxml b/main/ui/src/main/resources/fxml/unlock_select_masterkeyfile.fxml
index 91a643ef6..62a16a42f 100644
--- a/main/ui/src/main/resources/fxml/unlock_select_masterkeyfile.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_select_masterkeyfile.fxml
@@ -9,7 +9,6 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockSelectMasterkeyFileController"
@@ -35,7 +34,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/>
-					<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#proceed" disable="${controller.proceedButtonDisabled}"/>
+					<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#proceed"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>