From 8836ba6ceb091825c73ae5a99ba0e06b1827fc59 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Thu, 3 Jun 2021 22:48:52 +0200 Subject: [PATCH] Pick the correct backend-selected active theme (#9357) --- src/panels/profile/ha-pick-theme-row.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts index bb2ac4a86d..5ae1ecc679 100644 --- a/src/panels/profile/ha-pick-theme-row.ts +++ b/src/panels/profile/ha-pick-theme-row.ts @@ -36,7 +36,9 @@ export class HaPickThemeRow extends LitElement { const hasThemes = this.hass.themes.themes && Object.keys(this.hass.themes.themes).length; const curTheme = - this.hass.selectedTheme?.theme || this.hass.themes.default_theme; + this.hass.selectedTheme?.theme || this.hass.themes.darkMode + ? this.hass.themes.default_dark_theme || this.hass.themes.default_theme + : this.hass.themes.default_theme; const themeSettings = this.hass.selectedTheme;