diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
index 35b1b1903..24afab78a 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
@@ -129,8 +129,11 @@ public class PassphraseEntryController implements FxController {
 	}
 
 	private void windowClosed(WindowEvent windowEvent) {
-		LOG.debug("Unlock canceled by user.");
-		result.cancel(true);
+		if(!result.isDone()) {
+			result.cancel(true);
+			LOG.debug("Unlock canceled by user.");
+		}
+
 	}
 
 	@FXML