diff --git a/frontend/src/uxbox/main/ui/shapes/path.cljs b/frontend/src/uxbox/main/ui/shapes/path.cljs
index 07f3fd152..1cbd9b399 100644
--- a/frontend/src/uxbox/main/ui/shapes/path.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/path.cljs
@@ -8,7 +8,7 @@
   (:require
    [cuerdas.core :as str :include-macros true]
    [rumext.alpha :as mf]
-   [uxbox.main.data.workspace :as udw]
+   [uxbox.main.data.workspace :as dw]
    [uxbox.main.geom :as geom]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
@@ -29,8 +29,8 @@
               (common/on-mouse-down event shape selected))
             (on-double-click [event]
               (when selected?
-                (prn "on-double-click")
-                (st/emit! (udw/start-edition-mode (:id shape)))))]
+                (prn "path-component$on-double-click")
+                (st/emit! (dw/start-edition-mode (:id shape)))))]
       [:g.shape {:class (when selected? "selected")
                  :on-double-click on-double-click
                  :on-mouse-down on-mouse-down}
diff --git a/frontend/src/uxbox/main/ui/workspace/selection.cljs b/frontend/src/uxbox/main/ui/workspace/selection.cljs
index 87430604b..94e925c42 100644
--- a/frontend/src/uxbox/main/ui/workspace/selection.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/selection.cljs
@@ -229,7 +229,7 @@
   [{:keys [wst] :as props}]
   (let [shapes-map (mf/deref shapes-map-iref)
         shapes (map #(get shapes-map %) (:selected wst))
-        edition? (:edition wst)
+        edition (:edition wst)
         zoom (:zoom wst 1)
         num (count shapes)
         {:keys [id type] :as shape} (first shapes)]
@@ -243,11 +243,12 @@
                                        :zoom zoom}]
 
       (and (= type :text)
-           (= edition? (:id shape)))
+           (= edition (:id shape)))
       [:& text-edition-selection-handlers {:shape shape
                                            :zoom zoom}]
-      (and (= type :path)
-           (= edition? (:id shape)))
+      (and (or (= type :path)
+               (= type :curve))
+           (= edition (:id shape)))
       [:& path-edition-selection-handlers {:shape shape
                                            :zoom zoom}]