diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
index 19eab58ea..a478318e3 100644
--- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
@@ -27,7 +27,7 @@ public partial class EntryReleasesViewModel : ActivatableViewModelBase
         this.WhenActivated(d =>
         {
             router.CurrentPath.Subscribe(p =>
-                    SelectedRelease = p != null && p.StartsWith(Entry.GetEntryPath()) && float.TryParse(p.Split('/').Last(), out float releaseId)
+                    SelectedRelease = p != null && p.StartsWith($"{Entry.GetEntryPath()}/releases") && float.TryParse(p.Split('/').Last(), out float releaseId)
                         ? Releases.FirstOrDefault(r => r.Release.Id == releaseId)
                         : null)
                 .DisposeWith(d);
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml b/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml
index af6b25fc2..13be66d55 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutManageView.axaml
@@ -14,7 +14,7 @@
                 <Button Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Classes="icon-button" Command="{CompiledBinding Close}">
                     <avalonia:MaterialIcon Kind="ArrowBack" />
                 </Button>
-                <TextBlock Grid.Row="0" Grid.Column="1" Classes="h4 no-margin">Manage layout</TextBlock>
+                <TextBlock Grid.Row="0" Grid.Column="1" Theme="{StaticResource SubtitleTextBlockStyle}">Manage layout</TextBlock>
             </Grid>
 
             <Border Classes="card-separator" />
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml b/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml
index c6fe8c059..cf84560af 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginManageView.axaml
@@ -13,7 +13,7 @@
                 <Button Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Classes="icon-button" Command="{CompiledBinding Close}">
                     <avalonia:MaterialIcon Kind="ArrowBack" />
                 </Button>
-                <TextBlock Grid.Row="0" Grid.Column="1" Classes="h4 no-margin">Manage plugin</TextBlock>
+                <TextBlock Grid.Row="0" Grid.Column="1" Theme="{StaticResource SubtitleTextBlockStyle}">Manage plugin</TextBlock>
             </Grid>
             
             <Border Classes="card-separator" />