diff --git a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
index bce793631..afbd5a2ee 100644
--- a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
@@ -153,9 +153,9 @@
                                        (swap! state* assoc :refocus? true))
                        replace-token-with-value? (do
                                                    (dom/prevent-default event)
-                                                   (set-token-value! nil)
                                                    (on-token-remove token)
-                                                   (handle-change-input event))
+                                                   (handle-change-input event)
+                                                   (set-token-value! nil))
                        :else (set-token-value! value)))
              is-open? (let [up? (kbd/up-arrow? event)
                             down? (kbd/down-arrow? event)]