diff --git a/source/funkin/editors/charter/ChartDataScreen.hx b/source/funkin/editors/charter/ChartDataScreen.hx
index 137820e7..580a3aa2 100644
--- a/source/funkin/editors/charter/ChartDataScreen.hx
+++ b/source/funkin/editors/charter/ChartDataScreen.hx
@@ -12,7 +12,7 @@ class ChartDataScreen extends UISubstateWindow {
 	public var closeButton:UIButton;
 
 	public var scrollSpeedStepper:UINumericStepper;
-	public var stageBox:UITextBox;
+	public var stageTextBox:UITextBox;
 
 	public function new(data:ChartData) {
 		super();
@@ -23,38 +23,43 @@ class ChartDataScreen extends UISubstateWindow {
 		FlxG.sound.music.pause();
 		Charter.instance.vocals.pause();
 
-		function addLabelOn(ui:UISprite, text:String)
-			add(new UIText(ui.x, ui.y - 24, 0, text));
-
-		winTitle = 'Editing chart data';
-		winWidth = 420; winHeight = 69*4; // guys look, the funny numbers!
+		winTitle = 'Chart Properties';
+		winWidth = 420; winHeight = 230; // guys look, the funny numbers!
 
 		super.create();
 
-		scrollSpeedStepper = new UINumericStepper(windowSpr.x + 20, windowSpr.y + 60, data.scrollSpeed, 0.1, 2, 0, 10, 82);
+		function addLabelOn(ui:UISprite, text:String)
+			add(new UIText(ui.x, ui.y - 24, 0, text));
+
+		var title:UIText;
+		add(title = new UIText(windowSpr.x + 20, windowSpr.y + 30 + 16, 0, "Edit Chart Data", 28));
+
+		stageTextBox = new UITextBox(title.x, title.y + title.height + 38, PlayState.SONG.stage, 160);
+		add(stageTextBox);
+		addLabelOn(stageTextBox, "Stage");
+
+		scrollSpeedStepper = new UINumericStepper(stageTextBox.x + 160 + 26, stageTextBox.y, data.scrollSpeed, 0.1, 2, 0, 10, 82);
 		add(scrollSpeedStepper);
 		addLabelOn(scrollSpeedStepper, "Scroll Speed");
 
-		stageBox = new UITextBox(scrollSpeedStepper.x, scrollSpeedStepper.y + 60, PlayState.SONG.stage);
-		add(stageBox);
-		addLabelOn(stageBox, "Stage");
-
 		saveButton = new UIButton(windowSpr.x + windowSpr.bWidth - 20 - 125, windowSpr.y + windowSpr.bHeight - 16 - 32, "Save & Close", function() {
-			onSave();
+			saveInfo();
 			close();
 		}, 125);
 		add(saveButton);
 		
-		closeButton = new UIButton(saveButton.x - 20, saveButton.y, "Cancel", function() {
+		closeButton = new UIButton(saveButton.x - 20, saveButton.y, "Close", function() {
 			close();
 		}, 125);
 		add(closeButton);
 		closeButton.x -= closeButton.bWidth;
 	}
 
-	public function onSave()
+	public function saveInfo()
 	{
-		PlayState.SONG.stage = stageBox.label.text;
+		@:privateAccess scrollSpeedStepper.__onChange(scrollSpeedStepper.label.text);
+		
+		PlayState.SONG.stage = stageTextBox.label.text;
 		PlayState.SONG.scrollSpeed = scrollSpeedStepper.value;
 	}
 
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 5abdfa08..202f144a 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -199,14 +199,13 @@ class Charter extends UIState {
 						icon: Options.charterEnablePlaytestScripts ? 1 : 0
 					},
 					null,
-					{
-						label: "Edit metadata information",
-						onSelect: chart_edit_metadata
-					},
-					null,
 					{
 						label: "Edit chart data",
 						onSelect: chart_edit_data
+					},
+					{
+						label: "Edit metadata information",
+						onSelect: chart_edit_metadata
 					}
 				]
 			},
@@ -1098,11 +1097,12 @@ class Charter extends UIState {
 	function _chart_enablescripts(t) {
 		t.icon = (Options.charterEnablePlaytestScripts = !Options.charterEnablePlaytestScripts) ? 1 : 0;
 	}
-	function chart_edit_metadata(_)
-		FlxG.state.openSubState(new MetaDataScreen(PlayState.SONG.meta));
+
 	function chart_edit_data(_)
 		FlxG.state.openSubState(new ChartDataScreen(PlayState.SONG));
-
+	function chart_edit_metadata(_)
+		FlxG.state.openSubState(new MetaDataScreen(PlayState.SONG.meta));
+	
 	function _playback_metronome(t) {
 		t.icon = (Options.charterMetronomeEnabled = !Options.charterMetronomeEnabled) ? 1 : 0;
 	}
diff --git a/source/funkin/editors/ui/UIState.hx b/source/funkin/editors/ui/UIState.hx
index 5283447f..924b4ec0 100644
--- a/source/funkin/editors/ui/UIState.hx
+++ b/source/funkin/editors/ui/UIState.hx
@@ -121,8 +121,10 @@ class UIState extends MusicBeatState {
 	}
 
 	public function closeCurrentContextMenu() {
-		if(curContextMenu != null)
+		if(curContextMenu != null) {
 			curContextMenu.close();
+			curContextMenu = null;
+		}
 	}
 
 	public function openContextMenu(options:Array<UIContextMenuOption>, ?callback:UIContextMenuCallback, ?x:Float, ?y:Float) {