diff --git a/UICatalog/UICatalogTop.cs b/UICatalog/UICatalogTop.cs
index 233fb4a1e..54edb1adc 100644
--- a/UICatalog/UICatalogTop.cs
+++ b/UICatalog/UICatalogTop.cs
@@ -184,7 +184,8 @@ public class UICatalogTop : Toplevel
 
             _themesRg = new ()
             {
-                HighlightStyle = HighlightStyle.Hover
+                HighlightStyle = HighlightStyle.None,
+                SelectedItem = Themes.Keys.ToList ().IndexOf (CachedTheme!.Replace ("_", string.Empty))
             };
 
             _themesRg.SelectedItemChanged += (_, args) =>
@@ -205,7 +206,11 @@ public class UICatalogTop : Toplevel
 
             menuItems.Add (new Line ());
 
-            _topSchemeRg = new ();
+            _topSchemeRg = new ()
+            {
+                HighlightStyle = HighlightStyle.None,
+                SelectedItem = Colors.ColorSchemes.Keys.ToList().IndexOf(CachedTopLevelColorScheme!)
+            };
 
             _topSchemeRg.SelectedItemChanged += (_, args) =>
             {