diff --git a/src/uxbox/ui/shapes.cljs b/src/uxbox/ui/shapes.cljs
index 2d5e8db680..a31f8dade2 100644
--- a/src/uxbox/ui/shapes.cljs
+++ b/src/uxbox/ui/shapes.cljs
@@ -122,7 +122,8 @@
        [:g attrs
         (for [item (->> items
                         (map #(get shapes-by-id %))
-                        (remove :hidden))]
+                        (remove :hidden)
+                        (reverse))]
           (-> (factory item)
               (rum/with-key (str (:id item)))))]))))
 
diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs
index 95a3f1f2b2..a3bb8891a5 100644
--- a/src/uxbox/ui/workspace/canvas.cljs
+++ b/src/uxbox/ui/workspace/canvas.cljs
@@ -163,7 +163,7 @@
       [:svg.page-layout {}
        (shapes-selection shapes-selected)
        [:g.main {}
-        (for [item (sequence xf (:shapes page))]
+        (for [item (reverse (sequence xf (:shapes page)))]
           (-> (shape item workspace-selected)
               (rum/with-key (str (:id item)))))
         (selrect)