diff --git a/CHANGES.md b/CHANGES.md
index 032c8019c0..b91412bf54 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -38,6 +38,7 @@
 - Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
 - Update onboarding image [Taiga #13864](https://tree.taiga.io/project/penpot/issue/13864)
 - Fix hot update on color-row on texts [Taiga #13923](https://tree.taiga.io/project/penpot/issue/13923)
+- Fix selected color tokens [Taiga #13930](https://tree.taiga.io/project/penpot/issue/13930)
 
 ## 2.15.0 (Unreleased)
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
index 904f8c811e..99c08fcf1d 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
@@ -95,7 +95,13 @@
   [raw-tokens input-type]
   (delay
     (let [raw-tokens (deref raw-tokens)
-          key-order  (get  cto/tokens-by-input input-type)]
+          key-order  (case input-type
+                       :color-selection
+                       (concat
+                        (get cto/tokens-by-input :fill)
+                        (get cto/tokens-by-input :stroke-color))
+
+                       (get cto/tokens-by-input input-type))]
       (-> (reduce (fn [acc k]
                     (if (contains? raw-tokens k)
                       (assoc acc k (get raw-tokens k))