diff --git a/blazor_lab/Components/InventoryGrid.razor.cs b/blazor_lab/Components/InventoryGrid.razor.cs
index 13696f3..51c4e58 100644
--- a/blazor_lab/Components/InventoryGrid.razor.cs
+++ b/blazor_lab/Components/InventoryGrid.razor.cs
@@ -7,8 +7,7 @@ namespace blazor_lab.Components
 
     public partial class InventoryGrid
     {
-        [Parameter]
-        public List<InventoryModel> Inventory { get; set; }
+        public List<InventoryModel> Inventory { get; set; } = Enumerable.Range(1, 18).Select(_ => new InventoryModel()).ToList();
 
         /// <summary>
         /// Used by GetItemImageBase64 in this component, rather than calling our DataService every time.
diff --git a/blazor_lab/Components/InventoryList.razor.cs b/blazor_lab/Components/InventoryList.razor.cs
index 3a01c71..71334eb 100644
--- a/blazor_lab/Components/InventoryList.razor.cs
+++ b/blazor_lab/Components/InventoryList.razor.cs
@@ -22,11 +22,13 @@ namespace blazor_lab.Components
         private string searchQuery = "";
 
         private int currentPage = 1;
-        private int pageSize = 10;
+        private readonly int pageSize = 10;
 
         private void UpdateFilteredItems()
         {
-            _filteredItems = string.IsNullOrEmpty(searchQuery) ? Items : Items.Where(i => i.DisplayName.ToLower().Contains(searchQuery.ToLower())).ToList();
+            _filteredItems = string.IsNullOrEmpty(searchQuery)
+                ? Items
+                : Items.Where(i => i.DisplayName.ToLower().Contains(searchQuery.ToLower())).ToList();
             SortItems();
             VisibleItems = _filteredItems.Skip((currentPage - 1) * pageSize).Take(pageSize).ToList();
         }
@@ -77,6 +79,7 @@ namespace blazor_lab.Components
         {
             searchQuery = e.Value.ToString();
             await Task.Delay(250); // debounce the search to avoid excessive API requests
+            currentPage = 1; // Go back to page 1 when user is searching
             UpdateFilteredItems();
         }
         private void OnSortOptionChanged(ChangeEventArgs e)
diff --git a/blazor_lab/Pages/Inventory.razor b/blazor_lab/Pages/Inventory.razor
index 8db9eac..74772ef 100644
--- a/blazor_lab/Pages/Inventory.razor
+++ b/blazor_lab/Pages/Inventory.razor
@@ -5,11 +5,10 @@
 <div class="side-by-side">
     <div>
         <h2>@Localizer["my_inventory"]</h2>
-
-    <InventoryGrid Inventory="FreshInventory" Items="Items" />
+        <InventoryGrid Items="Items" />
     </div>
     <div>
         <h2>@Localizer["list_of_items"]</h2>
-    <InventoryList Items="Items" />
+        <InventoryList Items="Items" />
     </div>
 </div>
\ No newline at end of file
diff --git a/blazor_lab/Pages/Inventory.razor.cs b/blazor_lab/Pages/Inventory.razor.cs
index 759fcfb..f84cfee 100644
--- a/blazor_lab/Pages/Inventory.razor.cs
+++ b/blazor_lab/Pages/Inventory.razor.cs
@@ -20,7 +20,5 @@ namespace blazor_lab.Pages
         {
             Items = await DataApiService.All();
         }
-
-        private List<InventoryModel> FreshInventory = Enumerable.Range(1, 18).Select(_ => new InventoryModel()).ToList();
     }
 }