diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 7fab1364ba..1cd8258403 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.1.1+6cb54ccb05c2c63af78ad8cba8ff244278550c4a
\ No newline at end of file
+7.1.1+40ede377c8e67960f181dd22ce34a63eb952f3f6
\ No newline at end of file
diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html
index bb5de89261..43a5391540 100644
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@@ -6,8 +6,8 @@
 {{- $style   := (.Get "style") }}
 {{- $title   := (.Get "title") }}
 {{- $tabs := slice }}
-{{- if and .Parent (.Parent.Scratch.Get "tabs") }}
-    {{- $tabs = .Parent.Scratch.Get "tabs" }}
+{{- if and .Parent (.Parent.Store.Get "tabs") }}
+    {{- $tabs = .Parent.Store.Get "tabs" }}
 {{- end }}
 {{- $tabs = $tabs | append (dict
     "color"   $color
@@ -18,7 +18,7 @@
     "title"   $title
 ) }}
 {{- if .Parent }}
-    {{- $.Parent.Scratch.Set "tabs" $tabs }}
+    {{- $.Parent.Store.Set "tabs" $tabs }}
 {{- else }}
     {{- /* if no containing tabs shortcode is present, we display this tab as single */}}
     {{- partial "shortcodes/tabs.html" (dict
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 1e25a583ad..19cc7f39ba 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -7,7 +7,7 @@
 {{- $icon    := (.Get "icon") }}
 {{- $style   := (.Get "style") }}
 {{- $title   := (.Get "title") }}
-{{- $tabs    := (.Scratch.Get "tabs") }}
+{{- $tabs    := (.Store.Get "tabs") }}
 {{- partial "shortcodes/tabs.html" (dict
   "page"    .Page
   "color"   $color