diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 2cab863b8..b6f687c75 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -2123,9 +2123,14 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
         image.width = 70;
         image.height = 70;
 
+        if (char == currentSongMetadata.playData.characters.opponent) image.selected = true;
+
         image.icon = CharacterDataParser.getCharPixelIconAsset(char);
         image.onClick = _ -> {
+          healthIconsDirty = true;
+          currentSongMetadata.playData.characters.opponent = char;
           toolbox.hideDialog(haxe.ui.containers.dialogs.Dialog.DialogButton.APPLY);
+
           // var label = toolbox.findComponent('charIconName');
           // label.text = char;
         };