diff --git a/.changeset/hip-masks-love.md b/.changeset/hip-masks-love.md
new file mode 100644
index 000000000..1c0583add
--- /dev/null
+++ b/.changeset/hip-masks-love.md
@@ -0,0 +1,5 @@
+---
+"@openfun/cunningham-react": patch
+---
+
+Use `overflow:auto` instead of `overflow:scroll`
diff --git a/packages/react/src/components/DataGrid/_index.scss b/packages/react/src/components/DataGrid/_index.scss
index 4426c2e41..af706bac3 100644
--- a/packages/react/src/components/DataGrid/_index.scss
+++ b/packages/react/src/components/DataGrid/_index.scss
@@ -17,7 +17,7 @@
 
   &__table__container {
     width: 100%;
-    overflow: scroll;
+    overflow: auto;
 
     > table {
       border-collapse: collapse;
diff --git a/packages/react/src/components/Tooltip/_index.scss b/packages/react/src/components/Tooltip/_index.scss
index a185babcc..e90588c67 100644
--- a/packages/react/src/components/Tooltip/_index.scss
+++ b/packages/react/src/components/Tooltip/_index.scss
@@ -74,7 +74,7 @@
   }
 
   &__content {
-    overflow: scroll;
+    overflow: auto;
   }
 }