diff --git a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
index 2f8930678..bf2983d2f 100644
--- a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
@@ -82,7 +82,8 @@ public class SupporterCertificateController implements FxController {
 
 	@FXML
 	void didClickRemoveCert() {
-		removeCert.build().showRemoveCert();
+		Stage pref = (Stage) supporterCertificateField.getScene().getWindow();
+		removeCert.build().showRemoveCert(pref);
 	}
 
 	public LicenseHolder getLicenseHolder() {
diff --git a/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java b/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java
index 707dcc4da..40fc867f9 100644
--- a/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java
+++ b/src/main/java/org/cryptomator/ui/removecert/RemoveCertComponent.java
@@ -18,10 +18,11 @@ public interface RemoveCertComponent {
 	@FxmlScene(FxmlFile.REMOVE_CERT)
 	Lazy<Scene> scene();
 
-	default void showRemoveCert() {
+	default void showRemoveCert(Stage owner) {
 		Stage stage = window();
 		stage.setScene(scene().get());
 		stage.sizeToScene();
+		stage.initOwner(owner);
 		stage.show();
 	}