diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 924c2c8f4c3b513b8d8673ee4fc378bb77a9bfae..517b73e187e6c59f30fd999ffb05aba942ee1695 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -31,7 +31,7 @@ import de.tobias.utils.util.OS.OSType;
 import de.tobias.utils.util.Worker;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.scene.control.ButtonType;
+import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import javafx.stage.Window;
@@ -60,7 +60,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
 
 	private static PlayPadImpl impl;
 	private static PlayPadUpdater updater;
-	
+
 	public static ResourceBundle getUiResourceBundle() {
 		return uiResourceBundle;
 	}
@@ -108,7 +108,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
 			try {
 				Image stageIcon = new Image(iconPath);
 				PlayPadMain.stageIcon = Optional.of(stageIcon);
-			} catch (Exception e) {}
+			} catch (Exception e) {
+			}
 
 			/*
 			 * Setup
@@ -165,7 +166,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
 					Platform.runLater(() ->
 					{
 						AutoUpdateDialog autoUpdateDialog = new AutoUpdateDialog(owner);
-						autoUpdateDialog.showAndWait().filter(item -> item == ButtonType.APPLY).ifPresent(result ->
+						autoUpdateDialog.showAndWait().filter(item -> item.getButtonData() == ButtonData.APPLY).ifPresent(result ->
 						{
 							try {
 								Updates.startUpdate();
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
index c9a0df0fa17fd21bdb493a49d92f84ab90d0b264..4999837679d1ea9872e13304de64cc5e41647ba1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -52,6 +52,7 @@ import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
@@ -308,10 +309,10 @@ public class MainViewController extends ViewController implements IMainViewContr
 				if (result.isPresent()) {
 					globalSettings.setIgnoreSaveDialog(alert.isSelected());
 					ButtonType buttonType = result.get();
-					if (buttonType == ButtonType.YES) {
+					if (buttonType.getButtonData() == ButtonData.YES) {
 						// Projekt Speichern
 						saveProject();
-					} else if (buttonType == ButtonType.CANCEL) {
+					} else if (buttonType.getButtonData() == ButtonData.CANCEL_CLOSE) {
 						return false;
 					}
 				}