diff --git a/src/uxbox/ui/shapes/core.cljs b/src/uxbox/ui/shapes/core.cljs
index 9b04bc250..3f54c40ba 100644
--- a/src/uxbox/ui/shapes/core.cljs
+++ b/src/uxbox/ui/shapes/core.cljs
@@ -44,7 +44,8 @@
   [own id]
   (let [shape-l (focus-shape id)
         shape (rum/react shape-l)]
-    (render-component own shape)))
+    (when-not (:hidden shape)
+      (render-component own shape))))
 
 (def ^:const shape
   (mx/component