diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index a3125614aa..d739f56828 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -189,23 +189,18 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                T bestMatch = null;
-                float minDiff = float.MaxValue;
                 float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
+                Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                foreach (var section in Children)
+                if (scrollContainer.IsScrolledToEnd())
                 {
-                    float diff = Math.Abs(scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset);
-
-                    if (diff < minDiff)
-                    {
-                        minDiff = diff;
-                        bestMatch = section;
-                    }
+                    SelectedSection.Value = Children.LastOrDefault();
+                }
+                else
+                {
+                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
+                                            ?? Children.FirstOrDefault();
                 }
-
-                if (bestMatch != null)
-                    SelectedSection.Value = bestMatch;
             }
         }