From 22fea199319d8cfdb48aed11498a9edbe1a31128 Mon Sep 17 00:00:00 2001
From: Boris Sekachev <boris.sekachev@yandex.ru>
Date: Tue, 21 Apr 2020 23:40:29 +0300
Subject: [PATCH] Fixed highlighted attribute in AAM #1425

---
 cvat-canvas/src/typescript/canvasModel.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cvat-canvas/src/typescript/canvasModel.ts b/cvat-canvas/src/typescript/canvasModel.ts
index f7f095ea3501..d07526c91bdf 100644
--- a/cvat-canvas/src/typescript/canvasModel.ts
+++ b/cvat-canvas/src/typescript/canvasModel.ts
@@ -368,7 +368,9 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
     }
 
     public activate(clientID: number | null, attributeID: number | null): void {
-        if (this.data.activeElement.clientID === clientID) {
+        if (this.data.activeElement.clientID === clientID
+            && this.data.activeElement.attributeID === attributeID
+        ) {
             return;
         }