diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
index 1c4cf18c02..615d415bc1 100644
--- a/app/views/spree/admin/products/_primary_taxon_form.html.haml
+++ b/app/views/spree/admin/products/_primary_taxon_form.html.haml
@@ -2,5 +2,11 @@
   = f.label :primary_taxon_id, t('.product_category')
   %span.required *
   %br
-  = f.select :primary_taxon_id, options_from_collection_for_select(Spree::Taxon.order(:name), :id, :name, @product.primary_taxon_id), { include_blank: true }, { "data-controller": "tom-select", class: "primary" }
+  = render(SearchableDropdownComponent.new(form: f,
+      name: :primary_taxon_id,
+      aria_label: t('.product_category'),
+      options: Spree::Taxon.select(:name, :id).order(:name).pluck(:name, :id),
+      selected_option: @product.primary_taxon_id,
+      include_blank: true,
+      placeholder_value: t('.search_for_categories')))
   = f.error_message_on :primary_taxon_id
diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml
index d2a5591811..1fc934a4cf 100644
--- a/app/views/spree/admin/products/new.html.haml
+++ b/app/views/spree/admin/products/new.html.haml
@@ -11,7 +11,13 @@
           = f.field_container :supplier_id do
             = f.label :supplier_id, t(".supplier")
             %span.required *
-            = f.select :supplier_id, options_from_collection_for_select(@producers, :id, :name, @product.supplier_id), { include_blank: true }, { "data-controller": "tom-select", class: "primary" }
+            = render(SearchableDropdownComponent.new(form: f,
+                name: :supplier_id,
+                aria_label: t('.supplier'),
+                options: @producers.select(:name, :id).order(:name).pluck(:name, :id),
+                selected_option: @product.supplier_id,
+                include_blank: true,
+                placeholder_value: t('.search_for_suppliers')))
             = f.error_message_on :supplier_id
         .eight.columns.omega
           = f.field_container :name do
@@ -25,16 +31,19 @@
           = f.field_container :variant_unit do
             = f.label :variant_unit, t(".units")
             %span.required *
-            = f.select 'variant_unit', [],
-              { include_blank: true },
-              { id: 'product_variant_unit_with_scale',
-              name: 'product_variant_unit_with_scale',
-              'ng-model' => 'product.variant_unit_with_scale', 
-              'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options', 
-              "data-controller": "tom-select", 
-              "data-tom-select-options-value": '{"allowEmptyOption":false}', 
-              class: "primary",
-              }
+            = render(SearchableDropdownComponent.new(form: f,
+                name: :variant_unit,
+                aria_label: t('.units'),
+                options: [],
+                selected_option: @product.variant_unit,
+                include_blank: true,
+                placeholder_value: t('.search_for_units'),
+                other_attrs: { id: 'product_variant_unit_with_scale',
+                name: 'product_variant_unit_with_scale',
+                'ng-model' => 'product.variant_unit_with_scale', 
+                'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options', 
+                "data-controller": "tom-select",
+                "data-tom-select-options-value": '{"allowEmptyOption":false}'}))
             %input{ type: 'hidden', 'ng-value': 'product.variant_unit', "ng-init": "product.variant_unit='#{@product.variant_unit}'", name: 'product[variant_unit]' }
             %input{ type: 'hidden', 'ng-value': 'product.variant_unit_scale', "ng-init": "product.variant_unit_scale='#{@product.variant_unit_scale}'", name: 'product[variant_unit_scale]' }
             = f.error_message_on :variant_unit
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 250a6d85d5..758d1e4c65 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4468,6 +4468,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           new_product: "New Product"
           supplier: "Supplier"
           supplier_select_placeholder: "Select a supplier"
+          search_for_suppliers: "Search for suppliers"
+          search_for_units: "Search for units"
           product_name: "Product Name"
           units: "Unit Size"
           value: "Value"
@@ -4502,6 +4504,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           product_name: Product Name
         primary_taxon_form:
           product_category: Product Category
+          search_for_categories: "Search for categories"
         group_buy_form:
           group_buy: "Group Buy?"
           bulk_unit_size: Bulk unit size