diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 0c57f498ce..1ab80ff08c 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -152,7 +152,14 @@ export class HaDeviceEntitiesCard extends LitElement {
           .path=${domainIcon(computeDomain(entry.entity_id))}
         ></ha-svg-icon>
         <paper-item-body>
-          <div class="name">${entry.stateName || entry.entity_id}</div>
+          <div class="name">
+            ${entry.stateName
+              ? stripPrefixFromEntityName(
+                  entry.stateName,
+                  `${this.deviceName} `.toLowerCase()
+                )
+              : entry.entity_id}
+          </div>
         </paper-item-body>
       </paper-icon-item>
     `;
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 5a2d375d53..386e7efe14 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -121,7 +121,13 @@ export class HaConfigDevicePage extends LitElement {
       const result = groupBy(entities, (entry) =>
         entry.entity_category
           ? entry.entity_category
-          : ["sensor", "binary_sensor"].includes(computeDomain(entry.entity_id))
+          : [
+              "sensor",
+              "binary_sensor",
+              "camera",
+              "device_tracker",
+              "weather",
+            ].includes(computeDomain(entry.entity_id))
           ? "sensor"
           : "control"
       ) as Record<