diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
index 739b65fd2c8591af25fbf2d4eb134ffd7b92332b..90c49a89b0ed5b8325f6afa207d62357aa8af4ec 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
@@ -162,6 +162,7 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
 	@FXML
 	private void finishButtonHandler(ActionEvent event) {
 		onFinish();
+		getStageContainer().ifPresent(NVCStage::close);
 	}
 
 	/**
@@ -173,7 +174,6 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
 		for (PadSettingsTabViewController controller : tabs) {
 			controller.saveSettings(pad);
 		}
-		getStageContainer().ifPresent(NVCStage::close);
 		return true;
 	}
 }