diff --git a/CHANGES.md b/CHANGES.md
index a09d96f2a..619de08d6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -77,6 +77,7 @@
 - Fix scroll on color picker modal [Taiga #8353](https://tree.taiga.io/project/penpot/issue/8353)
 - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273)
 - Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888)
+- Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464)
 
 ## 2.1.5
 
diff --git a/frontend/src/app/main/ui/viewer/shapes.cljs b/frontend/src/app/main/ui/viewer/shapes.cljs
index 833a9fd79..0f9aec6bf 100644
--- a/frontend/src/app/main/ui/viewer/shapes.cljs
+++ b/frontend/src/app/main/ui/viewer/shapes.cljs
@@ -427,7 +427,8 @@
       (let [childs   (mapv #(get objects %) (:shapes (unchecked-get props "shape")))
             props    (obj/merge! #js {} props
                                  #js {:childs childs
-                                      :objects objects})]
+                                      :objects objects
+                                      :all-objects all-objects})]
         (when (not-empty childs)
           [:> group-wrapper props])))))