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 a5d3cc9e9b692f7e7cebf6082019e27b6e3c3e60..8077271155f28449fae35e010f0111c8fd399cc9 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
@@ -105,6 +105,11 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i
 		mappingComboBox.getSelectionModel().selectedItemProperty().addListener((a, b, c) ->
 		{
 			Profile.currentProfile().getMappings().setActiveMapping(c);
+			Mapping.setCurrentMapping(c);
+
+			Midi.getInstance().clearFeedback();
+			Midi.getInstance().showFeedback();
+
 			createTreeViewContent();
 		});
 
@@ -359,6 +364,7 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i
 					{
 						mappingComboBox.getItems().add(preset);
 						mappingComboBox.getSelectionModel().select(preset);
+
 						mappingDeleteButton.setDisable(mappingList.count() == 1);
 
 						// Rename preset if name already esists
@@ -403,13 +409,13 @@ public class MappingTabViewController extends ProfileSettingsTabViewController i
 		profileSettings.setLightMode(lightModeComboBox.getValue());
 
 		// Adjust midi color
-
 		final MidiFeedbackTranscript transcript = Midi.getInstance().getFeedbackTranscript();
 
 		if (transcript == null) {
 			return;
 		}
 
+		// Change light mode
 		Mapping.getCurrentMapping().getActions().forEach(action ->
 				action.getKeysForType(MidiKey.class).forEach(key ->
 					Stream.of(FeedbackType.values()).forEach(type -> {
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
index 5d1eded539de6fa2e1658fcbaab9550346f931c7..43b68616b2f60bfe777cb52cef208acb88f6ea2a 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
@@ -73,7 +73,7 @@ public class ColorAdjuster {
 		Color layoutEvColor = null;
 
 		FeedbackDesignColorSuggester design;
-		if (pad.getPadSettings().isCustomDesign()) {
+		if (pad != null && pad.getPadSettings().isCustomDesign()) {
 			design = pad.getPadSettings().getDesign();
 		} else {
 			design = Profile.currentProfile().getProfileSettings().getDesign();