diff --git a/CHANGES.md b/CHANGES.md
index ec0a807a8e..bcdf071c44 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@
 
 ### :bug: Bugs fixed
 
+- Fixed ungroup typography when editing it [Taiga #2391](https://tree.taiga.io/project/penpot/issue/2391) 
 - Fixed error when trying to post an empty comment [Taiga #2603](https://tree.taiga.io/project/penpot/issue/2603)
 - Fixed missing translation strings [Taiga #2786](https://tree.taiga.io/project/penpot/issue/2786)
 - Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715)
diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 9c30f882b5..e93a039837 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -245,9 +245,7 @@
   (ptk/reify ::update-typography
     ptk/WatchEvent
     (watch [it state _]
-      (let [[path name] (cph/parse-path-name (:name typography))
-            typography  (assoc typography :path path :name name)
-            prev        (get-in state [:workspace-data :typographies (:id typography)])
+      (let [prev        (get-in state [:workspace-data :typographies (:id typography)])
             rchg        {:type :mod-typography
                          :typography typography}
             uchg        {:type :mod-typography
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
index 79433fcb56..78f57f88ef 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
@@ -471,7 +471,8 @@
          (fn [event]
            (let [content (dom/get-target-val event)]
              (when-not (str/blank? content)
-               (on-change {:name content})))))
+               (let [[path name] (cph/parse-path-name content)]
+                 (on-change {:name name :path path}))))))
 
         handle-go-to-edit
         (fn []
@@ -510,8 +511,9 @@
          (let [content (mf/ref-val name-ref)]
            ;; On destroy we check if it changed
            (when (and (some? content) (not= content (:name typography)))
-             (let [{:keys [on-change]} (mf/ref-val on-change-ref)]
-               (on-change {:name content})))))))
+             (let [{:keys [on-change]} (mf/ref-val on-change-ref)
+                 [path name] (cph/parse-path-name content)]
+             (on-change {:name name :path path})))))))
 
     [:*
      [:div.element-set-options-group.typography-entry