diff --git a/cvat/apps/engine/static/engine/js/shapeCollection.js b/cvat/apps/engine/static/engine/js/shapeCollection.js
index 1f1121c0bf82..665f5033845b 100644
--- a/cvat/apps/engine/static/engine/js/shapeCollection.js
+++ b/cvat/apps/engine/static/engine/js/shapeCollection.js
@@ -813,7 +813,7 @@ class ShapeCollectionModel extends Listener {
     }
 
     get activeShape() {
-        return this._activeShape;
+        return this._activeAAMShape || this._activeShape;
     }
 
     get currentShapes() {