diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index 2a996eea3..953ca554f 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -251,6 +251,12 @@
   [name]
   (split-path name set-separator))
 
+(defn normalize-set-name
+  [name]
+  (->> (split-token-set-name name)
+       (map str/trim)
+       (str/join set-separator)))
+
 (defn get-token-set-path [token-set]
   (let [path (get-path token-set set-separator)]
     (add-token-set-paths-prefix path)))
diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index 0b178e73a..f30c0563f 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -136,15 +136,26 @@
 
     ptk/WatchEvent
     (watch [it state _]
-      (let [token-set' (-> token-set
-                           (update :name #(if (empty? %)
-                                            set-name
-                                            (ctob/join-set-path [% set-name]))))
-            data (dsh/lookup-file-data state)
-            token-set-name (:name token-set')
-            changes   (-> (pcb/empty-changes it)
-                          (pcb/with-library-data data)
-                          (pcb/set-token-set token-set-name false token-set'))]
+      (let [token-set'
+            ;; FIXME: wtf is this?
+            (update token-set :name #(if (empty? %)
+                                       set-name
+                                       (ctob/join-set-path [% set-name])))
+
+            token-set'
+            (update token-set' :name ctob/normalize-set-name)
+
+            data
+            (dsh/lookup-file-data state)
+
+            token-set-name
+            (:name token-set')
+
+            changes
+            (-> (pcb/empty-changes it)
+                (pcb/with-library-data data)
+                (pcb/set-token-set token-set-name false token-set'))]
+
         (rx/of (set-selected-token-set-name token-set-name)
                (dch/commit-changes changes))))))