diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index 0571a2c0a..216ade0e9 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -292,8 +292,15 @@
      [:& title-bar {:all-clickable true
                     :title (tr "workspace.token.tokens-section-title" selected-token-set-name)}]
 
-     (for [{:keys [token-key token-type-props tokens]} (concat (:filled token-groups)
-                                                               (:empty token-groups))]
+     (for [{:keys [token-key token-type-props tokens]} (:filled token-groups)]
+       [:> token-component* {:key token-key
+                             :type token-key
+                             :selected-shapes selected-shapes
+                             :active-theme-tokens active-theme-tokens
+                             :tokens tokens
+                             :token-type-props token-type-props}])
+
+     (for [{:keys [token-key token-type-props tokens]} (:empty token-groups)]
        [:> token-component* {:key token-key
                              :type token-key
                              :selected-shapes selected-shapes