diff --git a/app/views/admin/producer_properties/_producer_property_fields.html.haml b/app/views/admin/producer_properties/_producer_property_fields.html.haml
index 79dc815f9d..314cbfc31a 100644
--- a/app/views/admin/producer_properties/_producer_property_fields.html.haml
+++ b/app/views/admin/producer_properties/_producer_property_fields.html.haml
@@ -4,7 +4,10 @@
     %span.handle
     = f.hidden_field :id
   %td.property_name
-    = f.text_field :property_name, :class => 'autocomplete'
+    - if spree_current_user.admin?
+      = f.text_field :property_name, :class => 'autocomplete'
+    - else
+      = f.select :property_name, @properties, { :include_blank => true }, { class: 'select2 fullwidth' }
   %td.value
     = f.text_field :value, :class => 'autocomplete'
   %td.actions