diff --git a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
index 707611995f..0e7d0c7531 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         private static readonly PositionSnapGridType[] grid_types = Enum.GetValues(typeof(PositionSnapGridType)).Cast<PositionSnapGridType>().ToArray();
 
-        private int currentGridTypeIndex;
-
         [Resolved]
         private EditorBeatmap editorBeatmap { get; set; } = null!;
 
@@ -252,9 +250,9 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private void nextGridType()
         {
-            currentGridTypeIndex = (currentGridTypeIndex + 1) % grid_types.Length;
-            GridType.Value = grid_types[currentGridTypeIndex];
-            gridTypeButtons.Items[currentGridTypeIndex].Select();
+            int nextGridTypeIndex = (Array.IndexOf(grid_types, GridType.Value) + 1) % grid_types.Length;
+            GridType.Value = grid_types[nextGridTypeIndex];
+            gridTypeButtons.Items[nextGridTypeIndex].Select();
         }
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)