diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 43de72c3ff85..02e0f970baf8 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -143,12 +143,23 @@ export const computeCards = (
       const cardConfig: ThermostatCardConfig = {
         type: "thermostat",
         entity: entityId,
+        features: [
+          {
+            type: "climate-hvac-modes",
+            hvac_modes: states[entityId]?.attributes?.hvac_modes,
+          },
+        ],
       };
       cards.push(cardConfig);
     } else if (domain === "humidifier") {
       const cardConfig: HumidifierCardConfig = {
         type: "humidifier",
         entity: entityId,
+        features: [
+          {
+            type: "humidifier-toggle",
+          },
+        ],
       };
       cards.push(cardConfig);
     } else if (domain === "media_player") {