diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ec8c68005f..660e1844aa 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -157,10 +157,16 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 foreach (var h in hitObjects)
                 {
-                    h.Position = new Vector2(
-                        quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X),
-                        quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y)
-                    );
+                    var newPosition = h.Position;
+
+                    // guard against no-ops and NaN.
+                    if (scale.X != 0 && quad.Width > 0)
+                        newPosition.X = quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X);
+
+                    if (scale.Y != 0 && quad.Height > 0)
+                        newPosition.Y = quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y);
+
+                    h.Position = newPosition;
                 }
             }