diff --git a/app/helpers/shop_helper.rb b/app/helpers/shop_helper.rb
index 04709faf5d..03aaaf148e 100644
--- a/app/helpers/shop_helper.rb
+++ b/app/helpers/shop_helper.rb
@@ -19,8 +19,10 @@ module ShopHelper
 
   def shop_tabs
     [
-      { name: 'home', title: t(:shopping_tabs_home), show: show_home_tab? },
-      { name: 'shop', title: t(:shopping_tabs_shop), show: !require_customer? },
+      { name: 'home', title: t(:shopping_tabs_home), show: show_home_tab?,
+        default: show_home_tab? },
+      { name: 'shop', title: t(:shopping_tabs_shop), show: !require_customer?,
+        default: !show_home_tab? },
       { name: 'about', title: t(:shopping_tabs_about), show: true },
       { name: 'producers', title: t(:shopping_tabs_producers), show: true },
       { name: 'contact', title: t(:shopping_tabs_contact), show: true },
diff --git a/app/views/shopping_shared/_tabs.html.haml b/app/views/shopping_shared/_tabs.html.haml
index 6974bc6c6f..aab67618a4 100644
--- a/app/views/shopping_shared/_tabs.html.haml
+++ b/app/views/shopping_shared/_tabs.html.haml
@@ -6,10 +6,10 @@
         .columns.small-12.large-8
           - shop_tabs.each do |tab|
             .page
-              %a{ id: tab[:name], href: "##{tab[:name]}", data: { action: "tabs-and-panels#changeActivePanel tabs-and-panels#changeActiveTab", "tabs-and-panels-target": "tab" }, class: ("selected" if tab[:name] == "shop") }=tab[:title]
+              %a{ id: tab[:name], href: "##{tab[:name]}", data: { action: "tabs-and-panels#changeActivePanel tabs-and-panels#changeActiveTab", "tabs-and-panels-target": "tab" }, class: ("selected" if tab[:default]) }=tab[:title]
         .columns.large-4.show-for-large-up
           = render partial: "shopping_shared/order_cycles"
     - shop_tabs.each do |tab|
-      %div{id: "#{tab[:name]}_panel", "data-tabs-and-panels-target": "panel #{'default' if tab[:name] === "shop"}" } 
+      %div{id: "#{tab[:name]}_panel", "data-tabs-and-panels-target": "panel #{'default' if tab[:default]}" } 
         .page-view
           = render "shopping_shared/tabs/#{tab[:name]}"
diff --git a/spec/helpers/shop_helper_spec.rb b/spec/helpers/shop_helper_spec.rb
index 660ab56257..3050f0b131 100644
--- a/spec/helpers/shop_helper_spec.rb
+++ b/spec/helpers/shop_helper_spec.rb
@@ -36,7 +36,7 @@ describe ShopHelper, type: :helper do
       end
 
       it "should show the home tab" do
-        expect(helper.shop_tabs).to include(name: "home", show: true, title: "Home")
+        expect(helper.shop_tabs).to include(name: "home", show: true, title: "Home", default: true)
       end
     end
   end