diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs
index 19f4a4ce3..95eb64076 100644
--- a/frontend/src/app/main/data/workspace/common.cljs
+++ b/frontend/src/app/main/data/workspace/common.cljs
@@ -87,7 +87,7 @@
     (watch [it state _]
       (let [edition (get-in state [:workspace-local :edition])
             drawing (get state :workspace-drawing)]
-        (when-not (or (some? edition) (not-empty drawing))
+        (when (and (nil? edition) (or (empty drawing) (= :curve (:tool drawing))))
           (let [undo  (:workspace-undo state)
                 items (:items undo)
                 index (or (:index undo) (dec (count items)))]
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index bde29f132..a766ea236 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -439,8 +439,6 @@
          [:& presence/active-cursors
           {:page-id page-id}])
 
-       [:& widgets/viewport-actions]
-
        [:& scroll-bars/viewport-scrollbars
         {:objects base-objects
          :zoom zoom
diff --git a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
index 6b1f42e87..be1d5372e 100644
--- a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
@@ -56,7 +56,8 @@
         drawing-obj (:object drawing)
         shape       (or drawing-obj (-> selected first))]
     (when (or (and (= (count selected) 1) (= (:id shape) edition) (not= :text (:type shape)))
-              (and (some? drawing-obj) (= :path (:type drawing-obj))))
+              (and (some? drawing-obj) (= :path (:type drawing-obj))
+                   (not= :curve (:tool drawing))))
       [:div.viewport-actions
        [:& path-actions {:shape shape}]])))