diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
index e6453ef16d4b6eddd5491fe696e841645f614bc4..c783b375be86c4a9dda8d13a7e3a1a0a626fdaaa 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
@@ -337,18 +337,21 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i
 		TextInputDialog dialog = new TextInputDialog();
 		dialog.initModality(Modality.WINDOW_MODAL);
 		dialog.initOwner(getContainingWindow());
-		dialog.setHeaderText("Umbenennen");
+		dialog.setHeaderText("Name");
 		dialog.setContentText("Geben Sie einen Namen für das Mapping Profil ein."); // TODO Localize
-		dialog.showAndWait().filter(s -> !s.isEmpty()).ifPresent(preset::setName);
+		dialog.showAndWait().filter(s -> !s.isEmpty()).ifPresent(name -> {
+			preset.setName(name);
 
-		final MappingCollection mappings = Profile.currentProfile().getMappings();
-		mappings.addMapping(preset);
-		mappingComboBox.getItems().add(preset);
-		mappingComboBox.getSelectionModel().select(preset);
+			final MappingCollection mappings = Profile.currentProfile().getMappings();
+			mappings.addMapping(preset);
+			mappingComboBox.getItems().add(preset);
+			mappingComboBox.getSelectionModel().select(preset);
+
+			if (mappings.count() > 1) {
+				mappingDeleteButton.setDisable(false);
+			}
+		});
 
-		if (mappings.count() > 1) {
-			mappingDeleteButton.setDisable(false);
-		}
 	}
 
 	@SuppressWarnings("Duplicates")