diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index d985860661..5571bd0316 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -1049,6 +1049,13 @@ class HUIRoot extends LitElement {
         #view {
           margin-top: calc(var(--header-height) + env(safe-area-inset-top));
           height: calc(100vh - var(--header-height) - env(safe-area-inset-top));
+          padding-left: env(safe-area-inset-left);
+          padding-right: env(safe-area-inset-right);
+          background: var(
+            --lovelace-background,
+            var(--primary-background-color)
+          );
+          overflow: auto;
           transform: translateZ(0);
           display: flex;
         }
@@ -1072,15 +1079,11 @@ class HUIRoot extends LitElement {
           *
           * https://github.com/home-assistant/home-assistant-polymer/pull/3806
           */
-          padding-left: env(safe-area-inset-left);
-          padding-right: env(safe-area-inset-right);
-          background: var(
-            --lovelace-background,
-            var(--primary-background-color)
-          );
-          overflow: auto;
-          width: 100%;
+          flex: 1 1 100%;
           height: 100%;
+          max-width: 100%;
+          padding-bottom: env(safe-area-inset-bottom);
+          display: block;
         }
         .hide-tab {
           display: none;
diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts
index dcd4cb42be..687d254af8 100644
--- a/src/panels/lovelace/views/hui-masonry-view.ts
+++ b/src/panels/lovelace/views/hui-masonry-view.ts
@@ -298,8 +298,8 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
       :host {
         display: block;
         padding-top: 4px;
+        height: 100%;
         box-sizing: border-box;
-        padding-bottom: env(safe-area-inset-bottom);
       }
 
       .badges {
diff --git a/src/panels/lovelace/views/hui-sidebar-view.ts b/src/panels/lovelace/views/hui-sidebar-view.ts
index ea12bef74d..38f3d871ff 100644
--- a/src/panels/lovelace/views/hui-sidebar-view.ts
+++ b/src/panels/lovelace/views/hui-sidebar-view.ts
@@ -196,8 +196,8 @@ export class SideBarView extends LitElement implements LovelaceViewElement {
       :host {
         display: block;
         padding-top: 4px;
+        height: 100%;
         box-sizing: border-box;
-        padding-bottom: env(safe-area-inset-bottom);
       }
 
       .container {