diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 592e26adc2..1777527ced 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public Action<BeatmapInfo> SelectionChanged;
 
+        /// <summary>
+        /// Raised when user finalises beatmap selection using <see cref="DrawableCarouselBeatmapSet.FilterableDifficultyIcon"/>
+        /// </summary>
+        public Action<BeatmapInfo> SelectionFinalised;
+
         public override bool HandleNonPositionalInput => AllowSelection;
         public override bool HandlePositionalInput => AllowSelection;
 
@@ -577,7 +582,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet);
+            var set = new CarouselBeatmapSet(beatmapSet, this);
 
             foreach (var c in set.Beatmaps)
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 301d0d4dae..66ee4d2aee 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Screens.Select.Carousel
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
+        public BeatmapCarousel Carousel;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, BeatmapCarousel carousel)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -24,6 +25,8 @@ namespace osu.Game.Screens.Select.Carousel
                       .Where(b => !b.Hidden)
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
+
+            Carousel = carousel;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 699e01bca7..536fca9e6f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -33,10 +34,13 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay;
         private readonly BeatmapSetInfo beatmapSet;
 
+        private BeatmapCarousel carousel;
+
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
             : base(set)
         {
             beatmapSet = set.BeatmapSet;
+            carousel = set.Carousel;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -117,7 +121,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             return beatmaps.Count > maximum_difficulty_icons
                 ? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.Beatmap.Ruleset).Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Key))
-                : beatmaps.Select(b => new FilterableDifficultyIcon(b));
+                : beatmaps.Select(b => new FilterableDifficultyIcon(b, carousel));
         }
 
         public MenuItem[] ContextMenuItems
@@ -210,12 +214,32 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            public FilterableDifficultyIcon(CarouselBeatmap item)
+            private BeatmapCarousel carousel;
+            private BeatmapInfo info;
+
+            public FilterableDifficultyIcon(CarouselBeatmap item, BeatmapCarousel carousel)
                 : base(item.Beatmap)
             {
                 filtered.BindTo(item.Filtered);
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
+
+                this.carousel = carousel;
+                info = item.Beatmap;
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                if(e.AltPressed || carousel.SelectedBeatmap == info)
+                {
+                    Schedule(() => carousel.SelectionFinalised?.Invoke(info));
+                }
+                else
+                {
+                    carousel.SelectBeatmap(info);
+                }
+
+                return true;
             }
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5037081b5e..bfa693cf3d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -155,6 +155,7 @@ namespace osu.Game.Screens.Select
                                             Origin = Anchor.CentreRight,
                                             RelativeSizeAxes = Axes.Both,
                                             SelectionChanged = updateSelectedBeatmap,
+                                            SelectionFinalised = beatmapInfo => { FinaliseSelection(beatmapInfo); },
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
                                         },
                                     }