From e71dd7409eb18efa88e598f9504a2944f1d58152 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 9 Jul 2020 13:48:28 +0200
Subject: [PATCH] Scenes: Fix entity picked from device doesn't add device
 (#6343)

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
---
 src/panels/config/scene/ha-scene-editor.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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;
   }