diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
index 04aa976ff1..8b85bb49a5 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Overlays.FirstRunSetup
 
             if (available)
             {
-                copyInformation.Text = "Data migration will use \"hard links\". No extra disk space will be used, and you can delete either data folder at any point without affecting the other installation.";
+                copyInformation.Text =
+                    "Data migration will use \"hard links\". No extra disk space will be used, and you can delete either data folder at any point without affecting the other installation.";
             }
             else if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
                 copyInformation.Text = "Lightweight linking of files is not supported on your operating system yet, so a copy of all files will be made during import.";
@@ -173,6 +174,18 @@ namespace osu.Game.Overlays.FirstRunSetup
                 c.Current.Disabled = !allow;
         }
 
+        public override void OnSuspending(ScreenTransitionEvent e)
+        {
+            stableLocatorTextBox.HidePopover();
+            base.OnSuspending(e);
+        }
+
+        public override bool OnExiting(ScreenExitEvent e)
+        {
+            stableLocatorTextBox.HidePopover();
+            return base.OnExiting(e);
+        }
+
         private partial class ImportCheckbox : SettingsCheckbox
         {
             public readonly StableContent StableContent;
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
index 63688841d0..1bcb1bcdf4 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -58,7 +57,7 @@ namespace osu.Game.Overlays.FirstRunSetup
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.None,
-                    Size = new Vector2(screen_width, screen_width / 16f * 9 / 2),
+                    Size = new Vector2(screen_width, screen_width / 16f * 9),
                     Children = new Drawable[]
                     {
                         new GridContainer
@@ -68,7 +67,6 @@ namespace osu.Game.Overlays.FirstRunSetup
                             {
                                 new Drawable[]
                                 {
-                                    new SampleScreenContainer(new PinnedMainMenu()),
                                     new SampleScreenContainer(new NestedSongSelect()),
                                 },
                                 // TODO: add more screens here in the future (gameplay / results)
@@ -109,17 +107,6 @@ namespace osu.Game.Overlays.FirstRunSetup
             public override bool? AllowTrackAdjustments => false;
         }
 
-        private partial class PinnedMainMenu : MainMenu
-        {
-            public override void OnEntering(ScreenTransitionEvent e)
-            {
-                base.OnEntering(e);
-
-                Buttons.ReturnToTopOnIdle = false;
-                Buttons.State = ButtonSystemState.TopLevel;
-            }
-        }
-
         private partial class UIScaleSlider : OsuSliderBar<float>
         {
             public override LocalisableString TooltipText => base.TooltipText + "x";