diff --git a/app/overrides/spree/admin/product_properties/_product_property_fields/replace_free_text_with_select.html.haml.deface b/app/overrides/spree/admin/product_properties/_product_property_fields/replace_free_text_with_select.html.haml.deface
deleted file mode 100644
index 486d35014e..0000000000
--- a/app/overrides/spree/admin/product_properties/_product_property_fields/replace_free_text_with_select.html.haml.deface
+++ /dev/null
@@ -1,6 +0,0 @@
-/ replace_contents "td.property_name"
-
-- if spree_current_user.admin?
-  = f.text_field :property_name, :class => 'autocomplete'
-- else
-  = f.select :property_name, @properties, { :include_blank => true }, { class: 'select2 fullwidth' }
diff --git a/app/views/spree/admin/product_properties/_product_properties_fields.html.haml b/app/views/spree/admin/product_properties/_product_properties_fields.html.haml
deleted file mode 100644
index 42c14632ad..0000000000
--- a/app/views/spree/admin/product_properties/_product_properties_fields.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-%tr.product_property.fields{"data-hook" => "product_property", id: "spree_#{dom_id(f.object)}"}
-  %td.no-border
-    %span.handle
-    = f.hidden_field :id
-  %td.property_name
-    = f.text_field :property_name, :class => 'autocomplete'
-  %td.value
-    = f.text_field :value, :class => 'autocomplete'
-  %td.actions
-    - if f.object.persisted?
-      = link_to_delete f.object, :no_text => true
diff --git a/app/views/spree/admin/product_properties/_product_property_fields.html.haml b/app/views/spree/admin/product_properties/_product_property_fields.html.haml
new file mode 100644
index 0000000000..d4362c4366
--- /dev/null
+++ b/app/views/spree/admin/product_properties/_product_property_fields.html.haml
@@ -0,0 +1,14 @@
+%tr.product_property.fields{"data-hook" => "product_property", id: "spree_#{dom_id(f.object)}"}
+  %td.no-border
+    %span.handle
+    = f.hidden_field :id
+  %td.property_name
+    - 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
+    - if f.object.persisted?
+      = link_to_delete f.object, no_text: true