From 649417782152266995f460cc40d2397977cf73b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= <joasoe@gmail.com>
Date: Thu, 2 Dec 2021 17:31:09 +0100
Subject: [PATCH] Fix SU sidebar issues (#10757)

---
 src/components/ha-sidebar.ts                        | 10 ++++++----
 src/panels/config/dashboard/ha-config-navigation.ts |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index af59b17c51..962bf47e89 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -370,9 +370,7 @@ class HaSidebar extends LitElement {
   private _renderPanels(panels: PanelInfo[]) {
     return panels.map((panel) =>
       this._renderPanel(
-        panel.url_path === "hassio"
-          ? "config/dashboard?focusedPath=hassio"
-          : panel.url_path,
+        panel.url_path,
         panel.url_path === this.hass.defaultPanel
           ? panel.title || this.hass.localize("panel.states")
           : this.hass.localize(`panel.${panel.title}`) || panel.title,
@@ -395,7 +393,11 @@ class HaSidebar extends LitElement {
     return html`
       <a
         aria-role="option"
-        href=${`/${urlPath}`}
+        href=${`/${
+          urlPath === "hassio"
+            ? "config/dashboard/?focusedPath=hassio"
+            : urlPath
+        }`}
         data-panel=${urlPath}
         tabindex="-1"
         @mouseenter=${this._itemMouseEnter}
diff --git a/src/panels/config/dashboard/ha-config-navigation.ts b/src/panels/config/dashboard/ha-config-navigation.ts
index ab1ee2e56e..1b45594c9e 100644
--- a/src/panels/config/dashboard/ha-config-navigation.ts
+++ b/src/panels/config/dashboard/ha-config-navigation.ts
@@ -28,7 +28,7 @@ class HaConfigNavigation extends LitElement {
 
   @property() public focusedPath?: string | null;
 
-  protected firstUpdated(changedProps: PropertyValues) {
+  protected updated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
     if (!this.focusedPath) {
       return;