diff --git a/.changeset/grumpy-zoos-retire.md b/.changeset/grumpy-zoos-retire.md
new file mode 100644
index 00000000000..5082d517d26
--- /dev/null
+++ b/.changeset/grumpy-zoos-retire.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': patch
+---
+
+Add spacing around components in storybook, adjust grid if there is spacing
diff --git a/polaris-react/.storybook/GridOverlay/GridOverlay.css b/polaris-react/.storybook/GridOverlay/GridOverlay.css
index 6ee8fd26ac1..a1a4fccc887 100644
--- a/polaris-react/.storybook/GridOverlay/GridOverlay.css
+++ b/polaris-react/.storybook/GridOverlay/GridOverlay.css
@@ -1,3 +1,7 @@
+.sb-main-padded .GridOverlay {
+  margin: 0 1rem;
+}
+
 .GridOverlay {
   --pc-top-bar-height: 56px;
   --pc-nav-width: 240px;
diff --git a/polaris-react/.storybook/polaris-readme-loader.js b/polaris-react/.storybook/polaris-readme-loader.js
index 999cb34f060..4deb39cd457 100644
--- a/polaris-react/.storybook/polaris-readme-loader.js
+++ b/polaris-react/.storybook/polaris-readme-loader.js
@@ -25,9 +25,14 @@ module.exports = function loader(source) {
 
   const readme = parseCodeExamples(source);
 
-  const hasFullscreenLayout = ['App provider', 'Frame', 'Navigation'].includes(
-    readme.name,
-  );
+  const hasFullscreenLayout = [
+    'App provider',
+    'Contextual save bar',
+    'Frame',
+    'Fullscreen bar',
+    'Navigation',
+    'Sheet',
+  ].includes(readme.name);
 
   const omitAppProvider = [
     'Frame',
diff --git a/polaris-react/.storybook/preview-body.html b/polaris-react/.storybook/preview-body.html
deleted file mode 100644
index b8777224ada..00000000000
--- a/polaris-react/.storybook/preview-body.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<style>
-  .sb-show-main.sb-main-padded {
-    padding: 0;
-  }
-</style>