diff --git a/Server/Components/Popups/EquipmentPopup.razor b/Server/Components/Popups/EquipmentPopup.razor
index ffe62c3..9161586 100644
--- a/Server/Components/Popups/EquipmentPopup.razor
+++ b/Server/Components/Popups/EquipmentPopup.razor
@@ -17,12 +17,23 @@
     </div>
     <div class="equipmentContent">
         <div>Inventory</div>
+        <div>
+            <select @bind="SelectedType">
+                <option value="All">All</option>
+                @foreach (var type in Enum.GetValues<ItemType>())
+                {
+                    <option value="@type.ToString()">@type.ToString()</option>
+                }
+            </select>
+        </div>
         <div class="eqColumn">
-
             @foreach (var item in UserService.Inventory.Where(x => !UserService.IsEquipped(x)))
             {
-                <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="UserService.IsEquipped(item)"
-                          OnUnequipClicked="() => Unequip(item)"></ItemCard>
+                @if (SelectedType == "All" || item.Type.ToString() == SelectedType)
+                {
+                    <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="UserService.IsEquipped(item)"
+                              OnUnequipClicked="() => Unequip(item)"></ItemCard>
+                }
             }
         </div>
         <div>Equipped</div>
diff --git a/Server/Components/Popups/EquipmentPopup.razor.cs b/Server/Components/Popups/EquipmentPopup.razor.cs
index 653d4d4..53856a0 100644
--- a/Server/Components/Popups/EquipmentPopup.razor.cs
+++ b/Server/Components/Popups/EquipmentPopup.razor.cs
@@ -32,4 +32,6 @@ public void Unequip(Item item)
     {
         UserService.Unequip(item);
     }
+
+    public string SelectedType { get; set; } = "All";
 }