diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
index 7650a10e8921d9d20ee384618f777ed98ecde139..4c862a80dbd9867a2094d4a9245700f5f95c9aac 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
@@ -111,9 +111,7 @@ public class GlobalSettingsViewController extends NVC implements IGlobalSettings
 	// Button Listener
 	@FXML
 	private void finishButtonHandler(ActionEvent event) {
-		if (onFinish()) {
-			getStageContainer().ifPresent(NVCStage::close);
-		}
+		getStageContainer().ifPresent(NVCStage::close);
 	}
 
 	/**
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
index 9cab45389cb4dbdc4fa911f4d16fe0c74d5b04c9..d7207797c3ac53c738aa6901dd20d8c5625dd775 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
@@ -96,9 +96,7 @@ public class ProjectSettingsViewController extends NVC implements IProjectSettin
 	// Button Listener
 	@FXML
 	private void finishButtonHandler(ActionEvent event) {
-		if (onFinish()) {
-			getStageContainer().ifPresent(NVCStage::close);
-		}
+		getStageContainer().ifPresent(NVCStage::close);
 	}
 
 	/**