diff --git a/CHANGES.md b/CHANGES.md
index 92e241c210..f6cd2b3a5f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@
 ### :sparkles: New features & Enhancements
 
 ### :bug: Bugs fixed
+
 - Fix text line-height values are wrong [Taiga #12252](https://tree.taiga.io/project/penpot/issue/12252)
 
 - Fix pan cursor not disabling viewport guides [Github #6985](https://github.com/penpot/penpot/issues/6985)
@@ -19,7 +20,7 @@
 - Fix on copy instance inside a components chain touched are missing [Taiga #12371](https://tree.taiga.io/project/penpot/issue/12371)
 - Fix problem with multiple selection and shadows [Github #7437](https://github.com/penpot/penpot/issues/7437)
 - Fix search shortcut [Taiga #10265](https://tree.taiga.io/project/penpot/issue/10265)
-
+- Fix shortcut conflict in text editor (increase/decrease font size vs word selection)
 
 ## 2.11.0 (Unreleased)
 
diff --git a/frontend/src/app/main/data/workspace/text/shortcuts.cljs b/frontend/src/app/main/data/workspace/text/shortcuts.cljs
index 10a46881d4..72cc1d396c 100644
--- a/frontend/src/app/main/data/workspace/text/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/text/shortcuts.cljs
@@ -231,13 +231,13 @@
                    :subsections [:text-editor]
                    :fn #(update-attrs-when-no-readonly {:text-decoration "toggle-line-through"})}
 
-   :font-size-inc {:tooltip (ds/meta-shift ds/right-arrow)
-                   :command (ds/c-mod "shift+right")
+   :font-size-inc {:tooltip (ds/meta-shift ">")
+                   :command (ds/c-mod "shift+.")
                    :subsections [:text-editor]
                    :fn #(update-attrs-when-no-readonly {:font-size-inc true})}
 
-   :font-size-dec {:tooltip (ds/meta-shift ds/left-arrow)
-                   :command (ds/c-mod "shift+left")
+   :font-size-dec {:tooltip (ds/meta-shift "<")
+                   :command (ds/c-mod "shift+,")
                    :subsections [:text-editor]
                    :fn #(update-attrs-when-no-readonly {:font-size-dec true})}
 
diff --git a/frontend/src/app/util/text_editor.cljs b/frontend/src/app/util/text_editor.cljs
index 8b7367a1c3..ab746f7393 100644
--- a/frontend/src/app/util/text_editor.cljs
+++ b/frontend/src/app/util/text_editor.cljs
@@ -101,8 +101,10 @@
               (impl/updateBlockData state block-key (clj->js attrs)))))
 
         state (impl/applyInlineStyle state (legacy.txt/attrs-to-styles attrs))
-        selected (impl/getSelectedBlocks state)]
-    (reduce update-blocks state selected)))
+        selection-after-apply (impl/getSelection state)
+        selected (impl/getSelectedBlocks state)
+        state (reduce update-blocks state selected)]
+    (impl/setSelection state selection-after-apply)))
 
 (defn update-editor-current-inline-styles-fn
   [state update-fn]