diff --git a/frontend/src/uxbox/main/geom.cljs b/frontend/src/uxbox/main/geom.cljs
index 41eebe1d38..37f19623b3 100644
--- a/frontend/src/uxbox/main/geom.cljs
+++ b/frontend/src/uxbox/main/geom.cljs
@@ -521,7 +521,7 @@
      (selection-rect-generic state shape))))
 
 (defn- selection-rect-generic
-  [state {:keys [id x1 y1 x2 y2] :as shape}]
+  [state {:keys [id] :as shape}]
   (let [{:keys [displacement resize]} (get-in state [:workspace :modifiers id])]
     (-> (shape->rect-shape shape)
         (assoc :type :rect :id id)
diff --git a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs b/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
index 97825e9863..41c216a5af 100644
--- a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
@@ -44,7 +44,7 @@
 
 (mx/defc generic-draw-area
   [shape zoom]
-  (let [{:keys [x1 y1 width height]} (geom/size shape)]
+  (let [{:keys [x1 y1 width height]} (geom/selection-rect shape)]
     [:g
      (-> (assoc shape :drawing? true)
          (shapes/render-component))