diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index f837968d02..f83244a3e4 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -979,6 +979,7 @@ export class HaDataTable extends LitElement {
         }
         lit-virtualizer {
           contain: size layout !important;
+          overscroll-behavior: contain;
         }
       `,
     ];
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 00870199b0..2dac2c0389 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -126,6 +126,7 @@ class PanelDeveloperTools extends LitElement {
           display: block;
           height: calc(100% - var(--header-height) - 48px);
           overflow: auto;
+          overscroll-behavior: contain;
         }
         paper-tabs {
           margin-left: max(env(safe-area-inset-left), 24px);
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index aa02a50a29..1797c30fae 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -1069,6 +1069,7 @@ class HUIRoot extends LitElement {
             var(--primary-background-color)
           );
           overflow: auto;
+          overscroll-behavior: contain;
           width: 100%;
           height: 100%;
           transform: translateZ(0);