diff --git a/CHANGES.md b/CHANGES.md
index 45d018adfd..959130e682 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,6 +48,8 @@
 - Fix problem with comments when user left the team [Taiga #5562](https://tree.taiga.io/project/penpot/issue/5562)
 - Fix problem with images patterns repeating [#3372](https://github.com/penpot/penpot/issues/3372)
 - Fix grid not being clipped in frames [#3365](https://github.com/penpot/penpot/issues/3365)
+- Fix cut/delete text layer when while creating text [Taiga #5602](https://tree.taiga.io/project/penpot/issue/5602)
+- Fix picking a gradient color in recent colors for a new color in the assets tab [Taiga #5601](https://tree.taiga.io/project/penpot/issue/5601)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs
index 0d460babbb..e96e27cb2c 100644
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -520,7 +520,8 @@
                           stops (mapv split-color-components (:stops gradient))
                           type  (case (:type gradient)
                                   :linear :linear-gradient
-                                  :radial :radial-gradient)]
+                                  :radial :radial-gradient
+                                  (:type state))]
                       (-> state
                           (assoc :type type)
                           (assoc :current-color (nth stops stop))
diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index a9a3f4fe70..eea3ec6c81 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -142,14 +142,17 @@
               (rx/merge
                (rx/of (update-editor-state shape nil))
                (when (and (not= content (:content shape))
-                          (some? (:current-page-id state)))
+                          (some? (:current-page-id state))
+                          (some? shape))
                  (rx/of
                   (dch/update-shapes
                    [id]
                    (fn [shape]
-                     (let [{:keys [width height]} modifiers]
+                     (let [{:keys [width height position-data]} modifiers]
                        (-> shape
                            (assoc :content content)
+                           (cond-> position-data
+                             (assoc :position-data position-data))
                            (cond-> new-shape?
                              (assoc :name text))
                            (cond-> (or (some? width) (some? height))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
index 82cbe41f95..d67352717d 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@@ -998,7 +998,7 @@
                                 :do-rename do-rename
                                 :cancel-rename cancel-rename
                                 :selected-full selected-full
-                                :selected-paths selected-paths}])])
+                                :selected-graphics-paths selected-paths}])])
         (for [[path-item content] groups]
           (when-not (empty? path-item)
             [:& graphics-group {:file-id file-id
@@ -1016,8 +1016,7 @@
                                 :on-rename-group on-rename-group
                                 :on-ungroup on-ungroup
                                 :on-context-menu on-context-menu
-                                :selected-full selected-full
-                                :selected-paths selected-paths}]))])]))
+                                :selected-full selected-full}]))])]))
 
 (mf/defc graphics-section
   {::mf/wrap-props false}
@@ -1200,7 +1199,7 @@
                           :open-groups open-groups
                           :renaming (:renaming @state)
                           :listing-thumbs? listing-thumbs?
-                          :selected selected
+                          :selected-objects selected
                           :on-asset-click on-asset-click
                           :on-drag-start on-drag-start
                           :do-rename do-rename