diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs
index 1b3015afab..645ccb5c8c 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs
@@ -39,9 +39,9 @@
 
         tooltip-content (cond
                           not-active
-                          (tr "not-active-token.no-name")
-                          has-errors
                           (tr "options.deleted-token")
+                          has-errors
+                          (tr "not-active-token.no-name")
                           :else
                           (mf/html [:> to/resolved-value-tooltip* {:token-name token-name
                                                                    :resolved-value resolved-value}]))]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
index 701ba4d134..1dcfa53306 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
@@ -98,16 +98,16 @@
         token-name-ref (mf/use-ref nil)
         swatch-tooltip-content (cond
                                  not-active
-                                 (tr "not-active-token.no-name")
-                                 has-errors
                                  (tr "options.deleted-token")
+                                 has-errors
+                                 (tr "not-active-token.no-name")
                                  :else
                                  (tr "workspace.tokens.resolved-value" resolved))
         name-tooltip-content (cond
                                not-active
-                               (tr "not-active-token.no-name")
-                               has-errors
                                (tr "options.deleted-token")
+                               has-errors
+                               (tr "not-active-token.no-name")
                                :else
                                #(mf/html
                                  [:div