diff --git a/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java
index b7eb9e4c..275921be 100644
--- a/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java
@@ -247,7 +247,7 @@ public class MPT1327ConfigurationEditor extends ChannelConfigurationEditor
             mChannelMapComboBox.setMaxWidth(Double.MAX_VALUE);
             mChannelMapComboBox.setDisable(true);
             mChannelMapComboBox.setTooltip(new Tooltip("Select a channel map to use for this system"));
-            mChannelMapComboBox.getItems().addAll(getPlaylistManager().getChannelMapModel().getChannelMaps());
+            mChannelMapComboBox.setItems(getPlaylistManager().getChannelMapModel().getChannelMaps());
             mChannelMapComboBox.setDisable(true);
             mChannelMapComboBox.getSelectionModel().selectedItemProperty()
                 .addListener((observable, oldValue, newValue) -> modifiedProperty().set(true));
diff --git a/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java b/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java
index 14d0278a..c268afeb 100644
--- a/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java
+++ b/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java
@@ -32,6 +32,7 @@ import io.github.dsheirer.controller.channel.Channel.ChannelType;
 import io.github.dsheirer.controller.channel.ChannelEvent;
 import io.github.dsheirer.controller.channel.ChannelModel;
 import io.github.dsheirer.controller.channel.ChannelProcessingManager;
+import io.github.dsheirer.controller.channel.map.ChannelMap;
 import io.github.dsheirer.controller.channel.map.ChannelMapModel;
 import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.module.log.EventLogManager;
@@ -113,10 +114,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
 
         mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave());
 
-        mChannelMapModel.addListener(t -> {
-            //Save the playlist for all channel map events
-            schedulePlaylistSave();
-        });
+        mChannelMapModel.getChannelMaps().addListener((ListChangeListener<ChannelMap>)c -> schedulePlaylistSave());
 
         mBroadcastModel.addListener(broadcastEvent -> {
             switch(broadcastEvent.getEvent())