diff --git a/ErsatzTV/Pages/MovieList.razor b/ErsatzTV/Pages/MovieList.razor
index 5ce4cea6e..ee8486a01 100644
--- a/ErsatzTV/Pages/MovieList.razor
+++ b/ErsatzTV/Pages/MovieList.razor
@@ -95,6 +95,10 @@
         {
             _query = value;
         }
+        else
+        {
+            _query = null;
+        }
 
         return RefreshData();
     }
diff --git a/ErsatzTV/Pages/Search.razor b/ErsatzTV/Pages/Search.razor
index 4a0a506a2..b12ca204a 100644
--- a/ErsatzTV/Pages/Search.razor
+++ b/ErsatzTV/Pages/Search.razor
@@ -187,7 +187,7 @@
 
     private string GetMoviesLink()
     {
-        var uri = "/media/movies";
+        var uri = "/media/movies/page/1";
         if (!string.IsNullOrWhiteSpace(_query))
         {
             uri = QueryHelpers.AddQueryString(uri, "query", _query);
@@ -197,7 +197,7 @@
 
     private string GetShowsLink()
     {
-        var uri = "/media/tv/shows";
+        var uri = "/media/tv/shows/page/1";
         if (!string.IsNullOrWhiteSpace(_query))
         {
             uri = QueryHelpers.AddQueryString(uri, "query", _query);
diff --git a/ErsatzTV/Pages/TelevisionShowList.razor b/ErsatzTV/Pages/TelevisionShowList.razor
index f7ce8f84c..8d868634a 100644
--- a/ErsatzTV/Pages/TelevisionShowList.razor
+++ b/ErsatzTV/Pages/TelevisionShowList.razor
@@ -95,6 +95,10 @@
         {
             _query = value;
         }
+        else
+        {
+            _query = null;
+        }
 
         return RefreshData();
     }