diff --git a/CutList.Web/Components/Pages/Materials/Index.razor b/CutList.Web/Components/Pages/Materials/Index.razor
index 95396d1..099a2f0 100644
--- a/CutList.Web/Components/Pages/Materials/Index.razor
+++ b/CutList.Web/Components/Pages/Materials/Index.razor
@@ -33,36 +33,47 @@ else if (materials.Count == 0)
 }
 else
 {
-    <table class="table table-striped table-hover">
-        <thead>
-            <tr>
-                <th>Shape</th>
-                <th>Type</th>
-                <th>Grade</th>
-                <th>Size</th>
-                <th style="width: 160px;">Actions</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var material in pagedMaterials)
-            {
-                <tr>
-                    <td>@material.Shape.GetDisplayName()</td>
-                    <td>@material.Type</td>
-                    <td>@material.Grade</td>
-                    <td>@material.Size</td>
-                    <td>
-                        <div class="d-flex gap-1">
-                            <a href="materials/@material.Id" class="btn btn-sm btn-outline-primary">Edit</a>
-                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(material)">Delete</button>
-                        </div>
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
+    <MaterialFilter AvailableGrades="availableGrades" Value="filterState" ValueChanged="OnFilterChanged" />
 
-    <Pager TotalCount="materials.Count" PageSize="pageSize" CurrentPage="currentPage" CurrentPageChanged="OnPageChanged" />
+    @if (filteredMaterials.Count == 0)
+    {
+        <div class="alert alert-warning">
+            No materials match your filters.
+        </div>
+    }
+    else
+    {
+        <table class="table table-striped table-hover">
+            <thead>
+                <tr>
+                    <th>Shape</th>
+                    <th>Type</th>
+                    <th>Grade</th>
+                    <th>Size</th>
+                    <th style="width: 100px;">Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var material in pagedMaterials)
+                {
+                    <tr>
+                        <td>@material.Shape.GetDisplayName()</td>
+                        <td>@material.Type</td>
+                        <td>@material.Grade</td>
+                        <td>@material.Size</td>
+                        <td>
+                            <div class="d-flex gap-1">
+                                <a href="materials/@material.Id" class="btn btn-sm btn-outline-primary" title="Edit"><i class="bi bi-pencil"></i></a>
+                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(material)" title="Delete"><i class="bi bi-trash"></i></button>
+                            </div>
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+
+        <Pager TotalCount="filteredMaterials.Count" PageSize="pageSize" CurrentPage="currentPage" CurrentPageChanged="OnPageChanged" />
+    }
 }
 
 <ConfirmDialog @ref="deleteDialog"
@@ -80,8 +91,37 @@ else
     private ConfirmDialog deleteDialog = null!;
     private Material? materialToDelete;
     private string deleteMessage = "";
+    private MaterialFilterState filterState = new();
 
-    private IEnumerable<Material> pagedMaterials => materials.Skip((currentPage - 1) * pageSize).Take(pageSize);
+    private List<Material> filteredMaterials => materials.Where(m =>
+    {
+        if (filterState.Shape.HasValue && m.Shape != filterState.Shape.Value)
+            return false;
+        if (filterState.Type.HasValue && m.Type != filterState.Type.Value)
+            return false;
+        if (!string.IsNullOrEmpty(filterState.Grade) && m.Grade != filterState.Grade)
+            return false;
+        if (!string.IsNullOrWhiteSpace(filterState.SearchText))
+        {
+            var search = filterState.SearchText.Trim();
+            if (!Contains(m.Size, search)
+                && !Contains(m.Grade, search)
+                && !Contains(m.Description, search)
+                && !Contains(m.Shape.GetDisplayName(), search))
+                return false;
+        }
+        return true;
+    }).ToList();
+
+    private IEnumerable<string> availableGrades => materials
+        .Select(m => m.Grade)
+        .Where(g => !string.IsNullOrEmpty(g))
+        .Distinct()
+        .OrderBy(g => g)!;
+
+    private IEnumerable<Material> pagedMaterials => filteredMaterials
+        .Skip((currentPage - 1) * pageSize)
+        .Take(pageSize);
 
     protected override async Task OnInitializedAsync()
     {
@@ -99,6 +139,12 @@ else
         }
     }
 
+    private void OnFilterChanged(MaterialFilterState state)
+    {
+        filterState = state;
+        currentPage = 1;
+    }
+
     private void ConfirmDelete(Material material)
     {
         materialToDelete = material;
@@ -113,11 +159,14 @@ else
             await MaterialService.DeleteAsync(materialToDelete.Id);
             materials = await MaterialService.GetAllAsync();
 
-            var totalPages = (int)Math.Ceiling((double)materials.Count / pageSize);
+            var totalPages = (int)Math.Ceiling((double)filteredMaterials.Count / pageSize);
             if (currentPage > totalPages && totalPages > 0)
                 currentPage = totalPages;
         }
     }
 
     private void OnPageChanged(int page) => currentPage = page;
+
+    private static bool Contains(string? value, string search) =>
+        value != null && value.Contains(search, StringComparison.OrdinalIgnoreCase);
 }
diff --git a/CutList.Web/Components/Pages/Stock/Index.razor b/CutList.Web/Components/Pages/Stock/Index.razor
index 3584324..b92647c 100644
--- a/CutList.Web/Components/Pages/Stock/Index.razor
+++ b/CutList.Web/Components/Pages/Stock/Index.razor
@@ -28,49 +28,60 @@ else if (stockItems.Count == 0)
 }
 else
 {
-    <table class="table table-striped table-hover">
-        <thead>
-            <tr>
-                <th>Shape</th>
-                <th>Type</th>
-                <th>Grade</th>
-                <th>Size</th>
-                <th>Length</th>
-                <th>On Hand</th>
-                <th style="width: 160px;">Actions</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var item in pagedItems)
-            {
-                <tr>
-                    <td>@item.Material.Shape.GetDisplayName()</td>
-                    <td>@item.Material.Type</td>
-                    <td>@item.Material.Grade</td>
-                    <td>@item.Material.Size</td>
-                    <td>@ArchUnits.FormatFromInches((double)item.LengthInches)</td>
-                    <td>
-                        @if (item.QuantityOnHand > 0)
-                        {
-                            <span class="badge bg-success">@item.QuantityOnHand</span>
-                        }
-                        else
-                        {
-                            <span class="badge bg-secondary">0</span>
-                        }
-                    </td>
-                    <td>
-                        <div class="d-flex gap-1">
-                            <a href="stock/@item.Id" class="btn btn-sm btn-outline-primary">Edit</a>
-                            <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(item)">Delete</button>
-                        </div>
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
+    <MaterialFilter AvailableGrades="availableGrades" Value="filterState" ValueChanged="OnFilterChanged" />
 
-    <Pager TotalCount="stockItems.Count" PageSize="pageSize" CurrentPage="currentPage" CurrentPageChanged="OnPageChanged" />
+    @if (filteredItems.Count == 0)
+    {
+        <div class="alert alert-warning">
+            No stock items match your filters.
+        </div>
+    }
+    else
+    {
+        <table class="table table-striped table-hover">
+            <thead>
+                <tr>
+                    <th>Shape</th>
+                    <th>Type</th>
+                    <th>Grade</th>
+                    <th>Size</th>
+                    <th>Length</th>
+                    <th>On Hand</th>
+                    <th style="width: 100px;">Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var item in pagedItems)
+                {
+                    <tr>
+                        <td>@item.Material.Shape.GetDisplayName()</td>
+                        <td>@item.Material.Type</td>
+                        <td>@item.Material.Grade</td>
+                        <td>@item.Material.Size</td>
+                        <td>@ArchUnits.FormatFromInches((double)item.LengthInches)</td>
+                        <td>
+                            @if (item.QuantityOnHand > 0)
+                            {
+                                <span class="badge bg-success">@item.QuantityOnHand</span>
+                            }
+                            else
+                            {
+                                <span class="badge bg-secondary">0</span>
+                            }
+                        </td>
+                        <td>
+                            <div class="d-flex gap-1">
+                                <a href="stock/@item.Id" class="btn btn-sm btn-outline-primary" title="Edit"><i class="bi bi-pencil"></i></a>
+                                <button class="btn btn-sm btn-outline-danger" @onclick="() => ConfirmDelete(item)" title="Delete"><i class="bi bi-trash"></i></button>
+                            </div>
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+
+        <Pager TotalCount="filteredItems.Count" PageSize="pageSize" CurrentPage="currentPage" CurrentPageChanged="OnPageChanged" />
+    }
 }
 
 <ConfirmDialog @ref="deleteDialog"
@@ -87,8 +98,40 @@ else
     private ConfirmDialog deleteDialog = null!;
     private StockItem? itemToDelete;
     private string deleteMessage = "";
+    private MaterialFilterState filterState = new();
 
-    private IEnumerable<StockItem> pagedItems => stockItems.Skip((currentPage - 1) * pageSize).Take(pageSize);
+    private List<StockItem> filteredItems => stockItems.Where(s =>
+    {
+        var m = s.Material;
+        if (filterState.Shape.HasValue && m.Shape != filterState.Shape.Value)
+            return false;
+        if (filterState.Type.HasValue && m.Type != filterState.Type.Value)
+            return false;
+        if (!string.IsNullOrEmpty(filterState.Grade) && m.Grade != filterState.Grade)
+            return false;
+        if (!string.IsNullOrWhiteSpace(filterState.SearchText))
+        {
+            var search = filterState.SearchText.Trim();
+            if (!Contains(m.Size, search)
+                && !Contains(m.Grade, search)
+                && !Contains(m.Description, search)
+                && !Contains(m.Shape.GetDisplayName(), search)
+                && !Contains(s.Name, search)
+                && !Contains(s.Notes, search))
+                return false;
+        }
+        return true;
+    }).ToList();
+
+    private IEnumerable<string> availableGrades => stockItems
+        .Select(s => s.Material.Grade)
+        .Where(g => !string.IsNullOrEmpty(g))
+        .Distinct()
+        .OrderBy(g => g)!;
+
+    private IEnumerable<StockItem> pagedItems => filteredItems
+        .Skip((currentPage - 1) * pageSize)
+        .Take(pageSize);
 
     protected override async Task OnInitializedAsync()
     {
@@ -96,6 +139,12 @@ else
         loading = false;
     }
 
+    private void OnFilterChanged(MaterialFilterState state)
+    {
+        filterState = state;
+        currentPage = 1;
+    }
+
     private void ConfirmDelete(StockItem item)
     {
         itemToDelete = item;
@@ -110,11 +159,14 @@ else
             await StockItemService.DeleteAsync(itemToDelete.Id);
             stockItems = await StockItemService.GetAllAsync();
 
-            var totalPages = (int)Math.Ceiling((double)stockItems.Count / pageSize);
+            var totalPages = (int)Math.Ceiling((double)filteredItems.Count / pageSize);
             if (currentPage > totalPages && totalPages > 0)
                 currentPage = totalPages;
         }
     }
 
     private void OnPageChanged(int page) => currentPage = page;
+
+    private static bool Contains(string? value, string search) =>
+        value != null && value.Contains(search, StringComparison.OrdinalIgnoreCase);
 }