From 4e02190f596ef230f6525f5a06113f77274165ff Mon Sep 17 00:00:00 2001
From: Oleg Isonen <oleg008@gmail.com>
Date: Tue, 12 Apr 2022 11:00:27 +0100
Subject: [PATCH] ensure both selected element and selected instance are the
 same id when selecting

---
 app/canvas/shared/active-element.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/canvas/shared/active-element.ts b/app/canvas/shared/active-element.ts
index 87d98416a9..a23757bf60 100644
--- a/app/canvas/shared/active-element.ts
+++ b/app/canvas/shared/active-element.ts
@@ -28,7 +28,9 @@ export const useActiveElementTracking = () => {
       if (element === null || rootInstance === undefined) return;
       const id = element?.id;
       if (!id) return;
-      if (selectedElement?.id === id) return;
+      if (selectedElement?.id === id && selectedInstance?.id === id) {
+        return;
+      }
       const instance = findInstanceById(rootInstance, element.id);
       if (instance === undefined) return;
       setSelectedInstance(instance);