diff --git a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
index 3d685ebe4..14a0270e3 100644
--- a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
+++ b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
@@ -16,7 +16,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-      <PackageReference Include="Refit" Version="6.0.24" />
+      <PackageReference Include="Refit" Version="6.0.38" />
       <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
     </ItemGroup>
 
diff --git a/ErsatzTV/ErsatzTV.csproj b/ErsatzTV/ErsatzTV.csproj
index 06441113d..410a98770 100644
--- a/ErsatzTV/ErsatzTV.csproj
+++ b/ErsatzTV/ErsatzTV.csproj
@@ -11,8 +11,8 @@
 
     <ItemGroup>
       <PackageReference Include="Accelist.FluentValidation.Blazor" Version="4.0.0" />
-      <PackageReference Include="FluentValidation" Version="9.5.2" />
-      <PackageReference Include="FluentValidation.AspNetCore" Version="9.5.2" />
+      <PackageReference Include="FluentValidation" Version="9.5.3" />
+      <PackageReference Include="FluentValidation.AspNetCore" Version="9.5.3" />
       <PackageReference Include="LanguageExt.Core" Version="3.4.15" />
       <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
@@ -20,14 +20,14 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="MudBlazor" Version="5.0.5" />
+      <PackageReference Include="MudBlazor" Version="5.0.6" />
       <PackageReference Include="Refit.HttpClientFactory" Version="6.0.24" />
       <PackageReference Include="Serilog" Version="2.10.0" />
       <PackageReference Include="Serilog.AspNetCore" Version="4.0.0" />
       <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
       <PackageReference Include="Serilog.Sinks.SQLite" Version="5.0.0" />
-      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.0" />
-      <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.0" />
+      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
+      <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor
index df20a70b1..30da4ad7b 100644
--- a/ErsatzTV/Shared/MainLayout.razor
+++ b/ErsatzTV/Shared/MainLayout.razor
@@ -1,4 +1,6 @@
 @using System.Reflection
+@using Microsoft.AspNetCore.WebUtilities
+@using Microsoft.Extensions.Primitives
 @using System.Web
 @inherits LayoutComponentBase
 @inject NavigationManager NavigationManager
@@ -15,7 +17,7 @@
             </a>
         </div>
         <MudTextField T="string"
-                      @ref="_textField"
+                      @bind-Value="@_query"
                       AdornmentIcon="@Icons.Material.Filled.Search"
                       Adornment="Adornment.Start"
                       Variant="Variant.Outlined"
@@ -65,7 +67,7 @@
 @code {
     private static readonly string InfoVersion = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "unknown";
 
-    private MudTextField<string> _textField;
+    private string _query;
 
     private MudTheme _ersatzTvTheme => new()
     {
@@ -89,12 +91,26 @@
         }
     };
 
+    protected override async Task OnParametersSetAsync()
+    {
+        await base.OnParametersSetAsync();
+
+        string query = new Uri(NavigationManager.Uri).Query;
+        if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value))
+        {
+            _query = value;
+        }
+        else
+        {
+            _query = string.Empty;
+        }
+    }
+
     private void OnSearchKeyDown(KeyboardEventArgs args)
     {
         if (args.Code == "Enter")
         {
-            string query = HttpUtility.UrlEncode(_textField.Value);
-            _textField.Reset();
+            string query = HttpUtility.UrlEncode(_query);
             NavigationManager.NavigateTo($"/search?query={query}", true);
             StateHasChanged();
         }