diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs
index 6d552c57ce..f0e6dd56f6 100644
--- a/src/uxbox/main/ui/workspace/drawarea.cljs
+++ b/src/uxbox/main/ui/workspace/drawarea.cljs
@@ -50,20 +50,34 @@
   (.close (::sub own))
   (dissoc own ::sub))
 
+(declare generic-shape-draw-area)
+(declare path-shape-draw-area)
+
 (mx/defc draw-area
   {:will-mount draw-area-will-mount
    :will-unmount draw-area-will-unmount
    :mixins [mx/static mx/reactive]}
-  [own]
+  []
   (let [shape (mx/react drawing-shape)
         position (mx/react drawing-position)]
     (when shape
-      (if position
-        (-> (assoc shape :drawing? true)
-            (geom/resize position)
-            (shapes/render-component))
-        (-> (assoc shape :drawing? true)
-            (shapes/render-component))))))
+      (if (= (:type shape) :path)
+        (path-shape-draw-area shape)
+        (generic-shape-draw-area shape position)))))
+
+(mx/defc generic-shape-draw-area
+  [shape position]
+  (if position
+    (-> (assoc shape :drawing? true)
+        (geom/resize position)
+        (shapes/render-component))
+    (-> (assoc shape :drawing? true)
+        (shapes/render-component))))
+
+(mx/defc path-shape-draw-area
+  [shape]
+  (-> (assoc shape :drawing? true)
+      (shapes/render-component)))
 
 ;; --- Drawing Initialization