diff --git a/packages/overlayscrollbars/src/styles/structure.scss b/packages/overlayscrollbars/src/styles/structure.scss
index 6d713f9..5f51ffd 100644
--- a/packages/overlayscrollbars/src/styles/structure.scss
+++ b/packages/overlayscrollbars/src/styles/structure.scss
@@ -97,6 +97,19 @@ html.os-viewport-scrollbar-hidden > body[data-overlayscrollbars] {
   flex-wrap: nowrap !important;
 }
 
+[data-overlayscrollbars~='grid'],
+[data-overlayscrollbars~='grid'] .os-padding {
+  display: grid;
+  grid-template: 1fr / 1fr;
+}
+
+[data-overlayscrollbars~='grid'] > .os-padding,
+[data-overlayscrollbars~='grid'] > .os-viewport,
+[data-overlayscrollbars~='grid'] > .os-padding > .os-viewport {
+  height: auto !important;
+  width: auto !important;
+}
+
 .os-padding,
 .os-viewport {
   box-sizing: inherit;
diff --git a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.scss b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.scss
index 626814b..f8106ae 100644
--- a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.scss
+++ b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.scss
@@ -156,6 +156,9 @@ body {
 .widthAuto > #target[data-overlayscrollbars~='host'] {
   display: inline-flex;
 }
+.widthAuto > #target[data-overlayscrollbars~='grid'] {
+  display: inline-grid;
+}
 .widthHundred > .container,
 .envWidthHundred {
   width: 100%;