diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 3e41550..827c008 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -319,13 +319,14 @@ api:
         - lambda: |-
             if (!id(is_uploading_tft)) {
               HomeAssistantEntity entity_id = extractHomeAssistantEntity(entity);
+              if (entity == "embedded_climate") entity_id.domain = "climate";
+              else if (entity_id.domain == "alarm_control_panel") entity_id.domain = "alarm";
               if (entity_id.domain != "invalid" or entity == "embedded_climate") {
                 detailed_entity->publish_state(entity);
-                if (entity_id.domain == "alarm_control_panel") entity_id.domain = "alarm";
                 goto_page->execute(entity_id.domain.c_str());
                 disp1->send_command_printf("back_page_id=%" PRIu8, get_page_id(back_page.c_str()));
                 if (entity_id.domain == "climate")
-                  disp1->set_component_value("embedded", (entity == "embedded_climate") ? 1 : 0);
+                  disp1->set_component_value("climate.embedded", (entity == "embedded_climate") ? 1 : 0);
               }
             }