diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts
index 166f3b7a91..a2db064c91 100644
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -185,8 +185,7 @@ class PartialPanelResolver extends HassRouterPage {
         curPanel.component_name !== "iframe" &&
         // Do not disconnect any custom panel that embeds into iframe (ie hassio)
         (curPanel.component_name !== "custom" ||
-          !(curPanel.config as CustomPanelInfo).config._panel_custom
-            .embed_iframe)
+          !(curPanel as CustomPanelInfo).config._panel_custom.embed_iframe)
       ) {
         this._disconnectedPanel = this.lastChild as HTMLElement;
         const activeEl = deepActiveElement(
diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts
index ae77545aa9..7c4232bfa3 100644
--- a/src/panels/calendar/ha-panel-calendar.ts
+++ b/src/panels/calendar/ha-panel-calendar.ts
@@ -62,7 +62,7 @@ class PanelCalendar extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header fixed slot="header">
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts
index 87ca5ea457..58166e74ba 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -127,7 +127,7 @@ class HaConfigDashboard extends LitElement {
     }
 
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header fixed slot="header">
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
index 4883ddb402..f768d764d8 100644
--- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
+++ b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
@@ -89,7 +89,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
           color: var(--primary-color);
         }
       </style>
-      <ha-app-layout has-scrolling-region="">
+      <ha-app-layout>
         <app-header slot="header" fixed="">
           <app-toolbar>
             <ha-icon-button-arrow-prev
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 00aaedb3c0..98542c9365 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -36,7 +36,7 @@ class PanelDeveloperTools extends LitElement {
   protected render(): TemplateResult {
     const page = this._page;
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header fixed slot="header">
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts
index be897abee6..19f98d3f60 100644
--- a/src/panels/history/ha-panel-history.ts
+++ b/src/panels/history/ha-panel-history.ts
@@ -50,7 +50,7 @@ class HaPanelHistory extends LitElement {
 
   protected render() {
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/logbook/ha-logbook.ts b/src/panels/logbook/ha-logbook.ts
index 6c8ecf866b..1cce036af0 100644
--- a/src/panels/logbook/ha-logbook.ts
+++ b/src/panels/logbook/ha-logbook.ts
@@ -6,6 +6,7 @@ import {
   property,
   PropertyValues,
   TemplateResult,
+  eventOptions,
 } from "lit-element";
 import { scroll } from "lit-virtualizer";
 import { formatDate } from "../../common/datetime/format_date";
@@ -17,6 +18,7 @@ import { computeRTL } from "../../common/util/compute_rtl";
 import "../../components/ha-icon";
 import { LogbookEntry } from "../../data/logbook";
 import { HomeAssistant } from "../../types";
+import { restoreScroll } from "../../common/decorators/restore-scroll";
 
 class HaLogbook extends LitElement {
   @property() public hass!: HomeAssistant;
@@ -29,6 +31,9 @@ class HaLogbook extends LitElement {
   // @ts-ignore
   private _rtl = false;
 
+  // @ts-ignore
+  @restoreScroll(".container") private _savedScrollPos?: number;
+
   protected shouldUpdate(changedProps: PropertyValues) {
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
     const languageChanged =
@@ -50,7 +55,7 @@ class HaLogbook extends LitElement {
     }
 
     return html`
-      <div class="container">
+      <div class="container" @scroll=${this._saveScrollPos}>
         ${scroll({
           items: this.entries,
           renderItem: (item: LogbookEntry, index?: number) =>
@@ -116,6 +121,11 @@ class HaLogbook extends LitElement {
     `;
   }
 
+  @eventOptions({ passive: true })
+  private _saveScrollPos(e: Event) {
+    this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
+  }
+
   private _entityClicked(ev: Event) {
     ev.preventDefault();
     fireEvent(this, "hass-more-info", {
diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts
index 8adb2a6c82..b51c07d50c 100644
--- a/src/panels/logbook/ha-panel-logbook.ts
+++ b/src/panels/logbook/ha-panel-logbook.ts
@@ -72,7 +72,7 @@ export class HaPanelLogbook extends LitElement {
 
   protected render() {
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index d75862cb4a..54f248ef80 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -8,7 +8,6 @@ import {
   mdiPencil,
   mdiHelpCircle,
 } from "@mdi/js";
-import "@polymer/app-layout/app-header-layout/app-header-layout";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-scroll-effects/effects/waterfall";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
diff --git a/src/panels/mailbox/ha-panel-mailbox.js b/src/panels/mailbox/ha-panel-mailbox.js
index 922d7d3d0a..21bc6dd6e3 100644
--- a/src/panels/mailbox/ha-panel-mailbox.js
+++ b/src/panels/mailbox/ha-panel-mailbox.js
@@ -76,7 +76,7 @@ class HaPanelMailbox extends EventsMixin(LocalizeMixin(PolymerElement)) {
         }
       </style>
 
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts
index f32e10ce47..4f8d07e584 100644
--- a/src/panels/profile/ha-panel-profile.ts
+++ b/src/panels/profile/ha-panel-profile.ts
@@ -68,7 +68,7 @@ class HaPanelProfile extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
             <ha-menu-button
diff --git a/src/panels/shopping-list/ha-panel-shopping-list.js b/src/panels/shopping-list/ha-panel-shopping-list.js
index 0f9e591367..1adc188439 100644
--- a/src/panels/shopping-list/ha-panel-shopping-list.js
+++ b/src/panels/shopping-list/ha-panel-shopping-list.js
@@ -68,7 +68,7 @@ class HaPanelShoppingList extends LocalizeMixin(PolymerElement) {
         }
       </style>
 
-      <app-header-layout has-scrolling-region>
+      <app-header-layout>
         <app-header slot="header" fixed>
           <app-toolbar>
             <ha-menu-button