diff --git a/src/uxbox/shapes.cljs b/src/uxbox/shapes.cljs
index 5de0c2c06e..44fa29c89f 100644
--- a/src/uxbox/shapes.cljs
+++ b/src/uxbox/shapes.cljs
@@ -10,6 +10,10 @@
 (def ^:static ^:private +hierarchy+
   (as-> (make-hierarchy) $
     (derive $ :builtin/icon ::shape)
+    (derive $ :builtin/rect ::shape)
+    (derive $ :builtin/line ::shape)
+    (derive $ :builtin/circle ::shape)
+    (derive $ :builtin/text ::shape)
     (derive $ :builtin/group ::shape)))
 
 (defn shape?