diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
index 4119c7870..67b0abd13 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
@@ -233,7 +233,7 @@
        i/arrow-slide]]
      (when-not collapsed?
        [:ul
-        (for [[index shape] (reverse shapes)]
+        (for [[index shape] shapes]
           [:& layer-item {:shape shape
                           :selected selected
                           :index index
diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
index 55b13a4cc..35bef155c 100644
--- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
@@ -154,8 +154,8 @@
      (for [item canvas]
        [:& canvas-wrapper {:shape item
                            :key (:id item)
-                           :childs (get shapes (:id item))}])
-     (for [item (get shapes nil)]
+                           :childs (reverse (get shapes (:id item)))}])
+     (for [item (reverse (get shapes nil))]
        [:& shape-wrapper {:shape item
                           :key (:id item)}])]))