diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index a3608e934..c96f673f3 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -108,7 +108,7 @@
                         :name "Token Set"
                         :tokens []}
                        token-set)]
-    (ptk/reify ::update-create-token
+    (ptk/reify ::create-token-set
       ptk/WatchEvent
       (watch [it _ _]
         (let [changes (-> (pcb/empty-changes it)
diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index 47346e15c..337781616 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -155,10 +155,14 @@
                    :flex-direction "column"
                    :gap "10px"}}
      [:& labeled-input {:label "Group name"
-                        :input-props {:value @group}}]
+                        :input-props {:value @group
+                                      :on-change #(reset! group (dom/event->value %))}}]
      [:& labeled-input {:label "Theme name"
-                        :input-props {:value @name}}]
-     [:button "Create"]]))
+                        :input-props {:value @name
+                                      :on-change #(reset! name (dom/event->value %))}}]
+     [:button {:on-click #(st/emit! (wdt/create-token-theme {:group @group
+                                                             :name @name}))}
+      "Create"]]))
 
 (mf/defc token-sets
   [_props]