diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 961d51672d..08f00562ef 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -532,6 +532,18 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
     }
     this._entities = [...this._entities, entityId];
     this._storeState(entityId);
+
+    const entityRegistry = this._entityRegistryEntries.find(
+      (entityReg) => entityReg.entity_id === entityId
+    );
+
+    if (
+      entityRegistry?.device_id &&
+      !this._devices.includes(entityRegistry.device_id)
+    ) {
+      this._devices = [...this._devices, entityRegistry.device_id];
+    }
+
     this._dirty = true;
   }