diff --git a/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee b/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
index 3e9f0b4821..bf0094bbd3 100644
--- a/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
@@ -4,5 +4,5 @@ Darkswarm.filter 'products', (Matcher) ->
     text ?= ""
     return products if text == ""
     products.filter (product) =>
-      propertiesToMatch = [product.name, product.variant_names, product.supplier.name, product.primary_taxon.name]
+      propertiesToMatch = [product.name, product.variant_names, product.supplier.name, product.primary_taxon.name, product.meta_keywords]
       Matcher.matchBeginning propertiesToMatch, text
diff --git a/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface b/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
index e4436f516f..84ad95e062 100644
--- a/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
+++ b/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
@@ -1,5 +1,5 @@
 / insert_bottom "[data-hook='admin_product_tabs']"
 
-- klass = current == 'SEO' ? 'active' : ''
+- klass = current == t(:Search) ? 'active' : ''
 %li{:class => klass}
-  = link_to_with_icon 'icon-tasks', t('admin.products.seo'), seo_admin_product_url(@product)
+  = link_to_with_icon 'icon-tasks', t(:Search), seo_admin_product_url(@product)
diff --git a/app/serializers/api/product_serializer.rb b/app/serializers/api/product_serializer.rb
index 6e3121702b..1ccc46b15f 100644
--- a/app/serializers/api/product_serializer.rb
+++ b/app/serializers/api/product_serializer.rb
@@ -36,7 +36,7 @@ class Api::CachedProductSerializer < ActiveModel::Serializer
   #delegate :cache_key, to: :object
   include ActionView::Helpers::SanitizeHelper
 
-  attributes :id, :name, :permalink
+  attributes :id, :name, :permalink, :meta_keywords
   attributes :on_demand, :group_buy, :notes, :description, :description_html
   attributes :properties_with_values
 
diff --git a/app/views/spree/admin/products/_seo_form.html.haml b/app/views/spree/admin/products/_seo_form.html.haml
index bbc5bdb4f0..60afca7f6a 100644
--- a/app/views/spree/admin/products/_seo_form.html.haml
+++ b/app/views/spree/admin/products/_seo_form.html.haml
@@ -1,11 +1,13 @@
 .row{"data-hook" => "admin_product_meta_form"}
   .alpha.eleven.columns
-    = f.field_container :meta_description do
-      = f.label :meta_keywords, t(:meta_keywords)
+    = f.field_container :meta_keywords do
+      = f.label :meta_keywords, t(:product_search_keywords)
+      %span.icon-question-sign{ 'ofn-with-tip' => t('admin.products.product_search_tip') }
       %br/
       = f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6
     = f.field_container :meta_description do
-      = f.label :meta_description, t(:meta_description)
+      = f.label :meta_description, t(:SEO_keywords)
+      %span.icon-question-sign{ 'ofn-with-tip' => t('admin.products.seo_tip') }
       %br/
       = f.text_field :meta_description, :class => 'fullwidth', :rows => 6
   .alpha.eleven.columns
diff --git a/app/views/spree/admin/products/seo.html.haml b/app/views/spree/admin/products/seo.html.haml
index ddcd00402f..04f4bbf0c8 100644
--- a/app/views/spree/admin/products/seo.html.haml
+++ b/app/views/spree/admin/products/seo.html.haml
@@ -1,8 +1,9 @@
 = render :partial => 'spree/admin/shared/product_sub_menu'
-= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'SEO' }
+= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => t(:Search) }
 = render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
 
-= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f|
-  %fieldset.no-border-top
-    = render :partial => 'seo_form', :locals => { :f => f }
-    = render :partial => 'spree/admin/shared/edit_resource_links'
+%div{ 'ng-app' => 'ofn.admin' }
+  = form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f|
+    %fieldset.no-border-top
+      = render :partial => 'seo_form', :locals => { :f => f }
+      = render :partial => 'spree/admin/shared/edit_resource_links'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9cd2167609..9f022a3d3c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -450,6 +450,11 @@ en:
         available_on: Available On
         av_on: "Av. On"
         upload_an_image: Upload an image
+      product_search_keywords: Product Search Keywords
+      product_search_tip: Type words to help search your products in the shops. Use space to separate each keyword.
+      SEO_keywords: SEO Keywords
+      seo_tip: Type words to help search your products in the web. Use space to separate each keyword.
+      Search: Search
       properties:
         property_name: Property Name
         inherited_property: Inherited Property
@@ -457,7 +462,6 @@ en:
         to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order."
       product_distributions: "Product Distributions"
       group_buy_options: "Group Buy Options"
-      seo: "SEO"
       back_to_products_list: "Back to products list"
 
     variant_overrides:
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 1c8bdc2603..18dd52ed73 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -184,19 +184,17 @@ feature %q{
       product.distributors.should == [@distributors[0]]
     end
 
-    scenario "editing product SEO" do
+    scenario "editing product Search" do
       product = product = create(:simple_product, supplier: @supplier2)
       visit spree.edit_admin_product_path product
-      within('#sidebar') { click_link 'SEO' }
-      fill_in "product_meta_keywords", :with => 'Meta Keywords'
-      fill_in 'Meta Description', :with => 'Meta Description'
+      within('#sidebar') { click_link 'Search' }
+      fill_in 'Product Search Keywords', :with => 'Product Search Keywords'
       fill_in 'Notes', :with => 'Just testing Notes'
       click_button 'Update'
-      flash_message.should == "Product \"#{product.name}\" has been successfully updated!"
+      expect(flash_message).to eq("Product \"#{product.name}\" has been successfully updated!")
       product.reload
-      product.notes.should == 'Just testing Notes'
-      product.meta_keywords.should == 'Meta Keywords'
-      product.meta_description.should == 'Meta Description'
+      expect(product.notes).to eq('Just testing Notes')
+      expect(product.meta_keywords).to eq('Product Search Keywords')
     end
 
     scenario "deleting product properties", js: true do
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 2445bc6ad0..c226569dfb 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -12,7 +12,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
     let(:supplier) { create(:supplier_enterprise) }
     let(:oc1) { create(:simple_order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise), orders_close_at: 2.days.from_now) }
     let(:oc2) { create(:simple_order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise), orders_close_at: 3.days.from_now) }
-    let(:product) { create(:simple_product, supplier: supplier) }
+    let(:product) { create(:simple_product, supplier: supplier, meta_keywords: "Domestic") }
     let(:variant) { product.variants.first }
     let(:order) { create(:order, distributor: distributor) }
 
@@ -169,7 +169,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
     describe "after selecting an order cycle with products visible" do
       let(:variant1) { create(:variant, product: product, price: 20) }
       let(:variant2) { create(:variant, product: product, price: 30, display_name: "Badgers") }
-      let(:product2) { create(:simple_product, supplier: supplier, name: "Meercats") }
+      let(:product2) { create(:simple_product, supplier: supplier, name: "Meercats", meta_keywords: "Wild") }
       let(:variant3) { create(:variant, product: product2, price: 40, display_name: "Ferrets") }
       let(:exchange) { Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) }
 
@@ -212,6 +212,10 @@ feature "As a consumer I want to shop with a distributor", js: true do
         fill_in "search", with: "Meer"           # For product named "Meercats"
         page.should have_content product2.name
         page.should_not have_content product.name
+
+        fill_in "search", with: "Dome"           # For product with meta_keywords "Domestic"
+        expect(page).to have_content product.name
+        expect(page).not_to have_content product2.name
       end
 
       it "returns search results for products where the search term matches one of the product's variant names" do