diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 5a0f25f7e0..e03fc91aa7 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings
                 controlWithCurrent?.Current.BindTo(bindable);
                 if (ShowsDefaultIndicator)
                 {
-                    restoreDefaultValueButton.Bindable.BindTo(bindable);
+                    restoreDefaultValueButton.Bindable = bindable.GetBoundCopy();
                     restoreDefaultValueButton.Bindable.TriggerChange();
                 }
             }
@@ -134,7 +134,17 @@ namespace osu.Game.Overlays.Settings
 
         private class RestoreDefaultValueButton<T> : Box, IHasTooltip
         {
-            internal readonly Bindable<T> Bindable = new Bindable<T>();
+            private Bindable<T> bindable;
+            internal Bindable<T> Bindable
+            {
+                get { return bindable; }
+                set
+                {
+                    bindable = value;
+                    bindable.ValueChanged += newValue => UpdateState();
+                    bindable.DisabledChanged += disabled => UpdateState();
+                }
+            }
 
             private Color4 buttonColour;
 
@@ -142,9 +152,6 @@ namespace osu.Game.Overlays.Settings
 
             public RestoreDefaultValueButton()
             {
-                Bindable.ValueChanged += value => UpdateState();
-                Bindable.DisabledChanged += disabled => UpdateState();
-
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsOverlay.CONTENT_MARGINS;
                 Alpha = 0f;
@@ -160,8 +167,8 @@ namespace osu.Game.Overlays.Settings
 
             protected override bool OnClick(InputState state)
             {
-                if (!Bindable.Disabled)
-                    Bindable.SetDefault();
+                if (bindable != null && !bindable.Disabled)
+                    bindable.SetDefault();
                 return true;
             }
 
@@ -186,8 +193,10 @@ namespace osu.Game.Overlays.Settings
 
             internal void UpdateState()
             {
-                var colour = Bindable.Disabled ? Color4.Gray : buttonColour;
-                this.FadeTo(Bindable.IsDefault ? 0f : hovering && !Bindable.Disabled ? 1f : 0.5f, 200, Easing.OutQuint);
+                if (bindable == null)
+                    return;
+                var colour = bindable.Disabled ? Color4.Gray : buttonColour;
+                this.FadeTo(bindable.IsDefault ? 0f : hovering && !bindable.Disabled ? 1f : 0.5f, 200, Easing.OutQuint);
                 this.FadeColour(ColourInfo.GradientHorizontal(colour.Opacity(0.8f), colour.Opacity(0)), 200, Easing.OutQuint);
             }
         }
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index dcf4a00a9a..9efe7455f7 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -76,7 +76,9 @@ namespace osu.Game.Screens.Menu
 
             welcome = audio.Sample.Get(@"welcome");
             seeya = audio.Sample.Get(@"seeya");
-            beatmaps.Delete(setInfo);
+
+            if (setInfo.Protected)
+                beatmaps.Delete(setInfo);
         }
 
         protected override void OnEntering(Screen last)
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 0cfe07628a..f4dcf9a69e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -186,13 +186,18 @@ namespace osu.Game.Screens.Select
 
         public Action<BeatmapInfo> HideDifficultyRequested;
 
+        private void selectNullBeatmap()
+        {
+            selectedGroup = null;
+            selectedPanel = null;
+            SelectionChanged?.Invoke(null);
+        }
+
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
             if (groups.All(g => g.State == BeatmapGroupState.Hidden))
             {
-                selectedGroup = null;
-                selectedPanel = null;
-                SelectionChanged?.Invoke(null);
+                selectNullBeatmap();
                 return;
             }
 
@@ -383,6 +388,14 @@ namespace osu.Game.Screens.Select
             if (group == null)
                 return;
 
+            if (selectedGroup == group)
+            {
+                if (getVisibleGroups().Count() == 1)
+                    selectNullBeatmap();
+                else
+                    SelectNext();
+            }
+
             groups.Remove(group);
             panels.Remove(group.Header);
             foreach (var p in group.BeatmapPanels)
@@ -391,9 +404,6 @@ namespace osu.Game.Screens.Select
             scrollableContent.Remove(group.Header);
             scrollableContent.RemoveRange(group.BeatmapPanels);
 
-            if (selectedGroup == group)
-                SelectNext();
-
             computeYPositions();
         }