diff --git a/frontend/src/app/main/ui/workspace/tokens/token.cljs b/frontend/src/app/main/ui/workspace/tokens/token.cljs
index 1762f1977..0ca965d9c 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token.cljs
@@ -9,6 +9,18 @@
   [token-name]
   (str/split token-name #"\.+"))
 
+(defn token-name->path-selector
+  "Splits token-name into map with `:path` and `:selector` using `token-name->path`.
+
+  `:selector` is the last item of the names path
+  `:path` is everything leading up the the `:selector`."
+  [token-name]
+  (let [path-segments (token-name->path token-name)
+        last-idx (dec (count path-segments))
+        [path [selector]] (split-at last-idx path-segments)]
+    {:path (seq path)
+     :selector selector}))
+
 (defn token-names-tree
   "Convert tokens into a nested tree with their `:name` as the path."
   [tokens]
@@ -31,18 +43,22 @@
 
     {\"foo\" {:name \"other\"}}"
   [token-name token-names-tree]
-  (let [name-path (token-name->path token-name)
-        result (reduce
-                (fn [acc cur]
-                  (let [target (get acc cur)]
-                    (cond
-                      ;; Path segment doesn't exist yet
-                      (nil? target) (reduced false)
-                      ;; A token exists at this path
-                      (:name target) (reduced true)
-                      ;; Continue traversing the true
-                      :else target)))
-                token-names-tree name-path)]
-    (if (map? result)
-      (some? (:name result))
-      result)))
+  (let [{:keys [path selector]} (token-name->path-selector token-name)
+        path-target (reduce
+                     (fn [acc cur]
+                       (let [target (get acc cur)]
+                         (prn target cur)
+                         (cond
+                           ;; Path segment doesn't exist yet
+                           (nil? target) (reduced false)
+                           ;; A token exists at this path
+                           (:name target) (reduced true)
+                           ;; Continue traversing the true
+                           :else target)))
+                     token-names-tree path)]
+    (cond
+      (boolean? path-target) path-target
+      (get path-target :name) true
+      :else (-> (get path-target selector)
+                (seq)
+                (boolean)))))
diff --git a/frontend/test/token_tests/token_test.cljs b/frontend/test/token_tests/token_test.cljs
index f2e0332c4..618dc9a21 100644
--- a/frontend/test/token_tests/token_test.cljs
+++ b/frontend/test/token_tests/token_test.cljs
@@ -28,6 +28,7 @@
                                       :value "{foo.bar.baz}"}}))))
 
 (t/deftest token-name-path-exists?-test
+  (t/is (true? (wtt/token-name-path-exists? "border-radius" {"border-radius" {"sm" {:name "sm"}}})))
   (t/is (true? (wtt/token-name-path-exists? "border-radius" {"border-radius" {:name "sm"}})))
   (t/is (true? (wtt/token-name-path-exists? "border-radius.sm" {"border-radius" {:name "sm"}})))
   (t/is (true? (wtt/token-name-path-exists? "border-radius.sm.x" {"border-radius" {:name "sm"}})))