diff --git a/cvat/apps/engine/static/engine/js/shapeCollection.js b/cvat/apps/engine/static/engine/js/shapeCollection.js
index bdb08126..084b6da6 100644
--- a/cvat/apps/engine/static/engine/js/shapeCollection.js
+++ b/cvat/apps/engine/static/engine/js/shapeCollection.js
@@ -904,19 +904,19 @@ class ShapeCollectionController {
     }
 
     switchActiveOccluded() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchActiveOccluded();
         }
     }
 
     switchAllLock() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchAllLock();
         }
     }
 
     switchActiveLock() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchActiveLock();
         }
     }
@@ -1327,17 +1327,17 @@ class ShapeCollectionView {
     static sortByZOrder() {
         if (window.cvat.job.z_order) {
             let content = $('#frameContent');
-            let shapes = content.find('.shape, .pointTempGroup, .shapeCreation, .aim').toArray().sort(
+            let shapes = $(content.find('.shape, .pointTempGroup, .shapeCreation, .aim').toArray().sort(
                 (a,b) => (+a.attributes.z_order.nodeValue - +b.attributes.z_order.nodeValue)
-            );
+            ));
+            let children = content.children().not(shapes);
 
             for (let shape of shapes) {
                 content.append(shape);
             }
 
-            let texts = content.find('.shapeText');
-            for (let text of texts) {
-                content.append(text);
+            for (let child of children) {
+                content.append(child);
             }
         }
     }
diff --git a/cvat/apps/engine/static/engine/js/shapes.js b/cvat/apps/engine/static/engine/js/shapes.js
index a38c1bb6..88b4b2d3 100644
--- a/cvat/apps/engine/static/engine/js/shapes.js
+++ b/cvat/apps/engine/static/engine/js/shapes.js
@@ -3080,9 +3080,11 @@ class PointsView extends PolyShapeView {
 
     _makeNotEditable() {
         PolyShapeView.prototype._makeNotEditable.call(this);
-        let interpolation = this._controller.interpolate(window.cvat.player.frames.current);
-        if (interpolation.position.points) {
-            this._drawPointMarkers(interpolation.position);
+        if (!this._controller.hiddenShape) {
+            let interpolation = this._controller.interpolate(window.cvat.player.frames.current);
+            if (interpolation.position.points) {
+                this._drawPointMarkers(interpolation.position);
+            }
         }
     }