diff --git a/CHANGES.md b/CHANGES.md
index f303bdd06..ef92386dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@
 - Fix file contextual menu in shared libraries at dashboard [Taiga #1865](https://tree.taiga.io/project/penpot/issue/1865).
 - Fix problem with color picker and fonts [#1049](https://github.com/penpot/penpot/issues/1049)
 - Fix negative values in blur [#1815](https://tree.taiga.io/project/penpot/issue/1815)
+- Fix problem when editing color in group [#1816](https://tree.taiga.io/project/penpot/issue/1816)
 
 ### :arrow_up: Deps updates
 ### :boom: Breaking changes
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
index 766c6cda3..8149b52d6 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@@ -798,7 +798,9 @@
 
         edit-color
         (fn [new-color]
-          (let [updated-color (merge new-color (select-keys color [:id :file-id :name]))]
+          (let [old-data (-> (select-keys color [:id :file-id])
+                             (assoc :name (cp/merge-path-item (:path color) (:name color))))
+                updated-color (merge new-color old-data)]
             (st/emit! (dwl/update-color updated-color file-id))))
 
         delete-color