diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 6bbff045b5..aa36a5c8fd 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -7,12 +7,11 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
-
-        protected override void LoadComplete()
+        public ChangelogUpdateStreamControl()
         {
-            // suppress base logic of immediately selecting first item if one exists
-            // (we always want to start with no stream selected).
+            SelectFirstTabByDefault = false;
         }
+
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index e2d4fc6051..7999023998 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -73,15 +73,19 @@ namespace osu.Game
             // find closest valid target
             IScreen current = getCurrentScreen();
 
+            if (current == null)
+                return;
+
             // a dialog may be blocking the execution for now.
             if (checkForDialog(current)) return;
 
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
+            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
             {
-                complete();
+                finalAction(current);
+                Cancel();
                 return;
             }
 
@@ -135,11 +139,5 @@ namespace osu.Game
             lastEncounteredDialogScreen = current;
             return true;
         }
-
-        private void complete()
-        {
-            finalAction(getCurrentScreen());
-            Cancel();
-        }
     }
 }