diff --git a/source/charting/ChartingState.hx b/source/charting/ChartingState.hx
index c52326083..8d6f93ef8 100644
--- a/source/charting/ChartingState.hx
+++ b/source/charting/ChartingState.hx
@@ -254,6 +254,11 @@ class ChartingState extends MusicBeatState
 		{
 			SongLoad.curDiff = _song.difficulties[Std.parseInt(diff)];
 			SongLoad.checkAndCreateNotemap(SongLoad.curDiff);
+
+			while (SongLoad.getSong()[curSection] == null)
+				addSection();
+
+			updateGrid();
 		});
 		difficultyDropDown.selectedLabel = SongLoad.curDiff;