diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index fe8756a4d2..fe92054d25 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -17,18 +17,16 @@ namespace osu.Game.Graphics.UserInterface
         public SearchTextBox()
         {
             Height = 35;
-            AddRange(new Drawable[]
+            Add(new SpriteIcon
             {
-                new SpriteIcon
-                {
-                    Icon = FontAwesome.Solid.Search,
-                    Origin = Anchor.CentreRight,
-                    Anchor = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = 10 },
-                    Size = new Vector2(20),
-                }
+                Icon = FontAwesome.Solid.Search,
+                Origin = Anchor.CentreRight,
+                Anchor = Anchor.CentreRight,
+                Margin = new MarginPadding { Right = 10 },
+                Size = new Vector2(20),
             });
 
+            TextFlow.Padding = new MarginPadding { Right = 35 };
             PlaceholderText = "type to search";
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 16204c3e38..f47144e5d8 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             set
             {
-                if (value == null)
+                if (value == null || string.IsNullOrEmpty(value.OnlineInfo.Covers.Cover))
                 {
                     beatmapCover.FadeOut(600, Easing.OutQuint);
                     return;
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.BeatmapListing
             }
         }
 
-        private readonly SearchTextBox textBox;
+        private readonly BeatmapSearchTextBox textBox;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
 
@@ -83,7 +84,7 @@ namespace osu.Game.Overlays.BeatmapListing
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
-                            textBox = new SearchTextBox
+                            textBox = new BeatmapSearchTextBox
                             {
                                 RelativeSizeAxes = Axes.X,
                             },
@@ -110,5 +111,15 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             background.Colour = colourProvider.Dark6;
         }
+
+        private class BeatmapSearchTextBox : SearchTextBox
+        {
+            protected override Color4 SelectionColour => Color4.Gray;
+
+            public BeatmapSearchTextBox()
+            {
+                PlaceholderText = @"type in keywords...";
+            }
+        }
     }
 }