diff --git a/src/frontend/src/forms/PurchaseOrderForms.tsx b/src/frontend/src/forms/PurchaseOrderForms.tsx
index d7ac96e597..d12916a49b 100644
--- a/src/frontend/src/forms/PurchaseOrderForms.tsx
+++ b/src/frontend/src/forms/PurchaseOrderForms.tsx
@@ -144,10 +144,25 @@ export function usePurchaseOrderLineItemFields({
           };
         },
         addCreateFields: {
-          part: {},
+          part: {
+            filters: {
+              active: true,
+              purchaseable: true
+            }
+          },
           SKU: {},
+          manufacturer_part: {
+            filters: {
+              part_detail: true,
+              manufacturer_detail: true,
+              active: true
+            }
+          },
           description: {},
-          supplier: { hidden: true }
+          supplier: {
+            hidden: true,
+            value: supplierId
+          }
         }
       },
       line: {},
diff --git a/src/frontend/src/pages/company/SupplierPartDetail.tsx b/src/frontend/src/pages/company/SupplierPartDetail.tsx
index 8431a530ac..017e6404db 100644
--- a/src/frontend/src/pages/company/SupplierPartDetail.tsx
+++ b/src/frontend/src/pages/company/SupplierPartDetail.tsx
@@ -79,9 +79,11 @@ export default function SupplierPartDetail() {
     const data = supplierPart ?? {};
 
     // Access nested data
-    data.manufacturer = data.manufacturer_detail?.pk;
-    data.MPN = data.manufacturer_part_detail?.MPN;
-    data.manufacturer_part = data.manufacturer_part_detail?.pk;
+    data.manufacturer =
+      supplierPart.manufacturer || data.manufacturer_detail?.pk;
+    data.MPN = supplierPart.MPN || data.manufacturer_part_detail?.MPN;
+    data.manufacturer_part =
+      supplierPart.manufacturer_part || data.manufacturer_part_detail?.pk;
 
     const tl: DetailsField[] = [
       {