diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
index 94c581194..5a69b066b 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
@@ -8,9 +8,9 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data :as d]
-   [app.main.data.modal :as modal]
    [app.common.data.macros :as dm]
    [app.main.data.events :as ev]
+   [app.main.data.modal :as modal]
    [app.main.data.shortcuts :as scd]
    [app.main.data.tokens :as dt]
    [app.main.data.workspace :as dw]
@@ -32,24 +32,20 @@
   (let [{:keys [modal attributes title]} token-type-props
         do-delete #(st/emit! (dt/delete-token token-id))
         do-duplicate #(st/emit! (dt/duplicate-token token-id))
-        do-edit #(println "Editing " modal)
-        edit-token (mf/use-fn
-                    (fn [event]
-                      (let [{:keys [key fields]} modal
-                            token (dt/get-token-data-from-token-id token-id)]
-                        (dom/stop-propagation event)
-                        (modal/show! key {:x (.-clientX ^js event)
-                                          :y (.-clientY ^js event)
-                                          :position :right
-                                          :fields fields
-                                          :token-type type
-                                          :token-name (:name token)
-                                          :token-value (:value token)
-                                          :token-description (:description token)}))))]
+        do-edit (fn [event]
+                  (let [{:keys [key fields]} modal
+                        token (dt/get-token-data-from-token-id token-id)]
+                    (st/emit! dt/hide-token-context-menu)
+                    (dom/stop-propagation event)
+                    (modal/show! key {:x (.-clientX ^js event)
+                                      :y (.-clientY ^js event)
+                                      :position :right
+                                      :fields fields
+                                      :token token})))]
     [:*
      [:& menu-entry {:title "Delete Token" :on-click do-delete}]
      [:& menu-entry {:title "Duplicate Token" :on-click do-duplicate}]
-     [:& menu-entry {:title "Edit Token" :on-click edit-token}]]))
+     [:& menu-entry {:title "Edit Token" :on-click do-edit}]]))
 
 (mf/defc token-context-menu
   []
diff --git a/frontend/src/app/main/ui/workspace/tokens/modal.cljs b/frontend/src/app/main/ui/workspace/tokens/modal.cljs
index 3c0cfc5e1..5529d328a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modal.cljs
@@ -43,23 +43,24 @@
 
 (mf/defc tokens-properties-form
   {::mf/wrap-props false}
-  [{:keys [token-type x y position fields token-name token-value token-description]}]
+  [{:keys [token-type x y position fields token]}]
   (let [vport (mf/deref viewport)
         style (calculate-position vport position x y)
 
-        name (mf/use-var (or token-name ""))
+        name (mf/use-var (or (:name token) ""))
         on-update-name #(reset! name (dom/get-target-val %))
         name-ref (mf/use-ref)
 
-        description (mf/use-var token-description)
+        token-value (mf/use-var (or (:value token) ""))
+
+        description (mf/use-var (or (:description token) ""))
         on-update-description #(reset! description (dom/get-target-val %))
 
-        initial-state (map (fn [field]
-                             (if (= (:key field) :value)
-                               (assoc field :value token-value)
-                               field))
-                           fields)
-        state (mf/use-state initial-state)
+        initial-fields (mapv (fn [field]
+                               (assoc field :value (or (:value token) "")))
+                             fields)
+        state (mf/use-state initial-fields)
+
         on-update-state-field (fn [idx e]
                                 (->> (dom/get-target-val e)
                                      (assoc-in @state [idx :value])
@@ -71,9 +72,10 @@
                                           (first)
                                           (val))
                           token (cond-> {:name @name
-                                         :type token-type
+                                         :type (or (:type token) token-type)
                                          :value token-value}
-                                  @description (assoc :description @description))]
+                                  @description (assoc :description @description)
+                                  (:id token) (assoc :id (:id token)))]
                       (st/emit! (dt/add-token token))
                       (modal/hide!)))]
 
@@ -87,7 +89,7 @@
       :on-submit on-submit}
      [:div {:class (stl/css :token-rows)}
       [:& tokens.common/labeled-input {:label "Name"
-                                       :value @name
+                                       :default-value @name
                                        :on-change on-update-name
                                        :input-ref name-ref}]
       (for [[idx {:keys [type label]}] (d/enumerate @state)]
@@ -95,8 +97,10 @@
          (case type
            :box-shadow [:p "TODO BOX SHADOW"]
            [:& tokens.common/labeled-input {:label label
+                                            :default-value @token-value
                                             :on-change #(on-update-state-field idx %)}])])
       [:& tokens.common/labeled-input {:label "Description"
+                                       :default-value @description
                                        :on-change #(on-update-description %)}]
       [:div {:class (stl/css :button-row)}
        [:button {:class (stl/css :button)