diff --git a/app/controllers/spree/admin/product_properties_controller.rb b/app/controllers/spree/admin/product_properties_controller.rb
new file mode 100644
index 0000000000..d5a783192d
--- /dev/null
+++ b/app/controllers/spree/admin/product_properties_controller.rb
@@ -0,0 +1,19 @@
+module Spree
+  module Admin
+    class ProductPropertiesController < ResourceController
+      belongs_to 'spree/product', find_by: :permalink
+      before_filter :find_properties
+      before_filter :setup_property, only: [:index]
+
+      private
+
+      def find_properties
+        @properties = Spree::Property.pluck(:name)
+      end
+
+      def setup_property
+        @product.product_properties.build
+      end
+    end
+  end
+end
diff --git a/app/controllers/spree/admin/properties_controller.rb b/app/controllers/spree/admin/properties_controller.rb
new file mode 100644
index 0000000000..dcccad41f9
--- /dev/null
+++ b/app/controllers/spree/admin/properties_controller.rb
@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class PropertiesController < ResourceController
+    end
+  end
+end