diff --git a/frontend/src/app/main/ui/workspace/tokens/token_types.cljs b/frontend/src/app/main/ui/workspace/tokens/token_types.cljs
index 6b6c169169..a083bed547 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_types.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_types.cljs
@@ -66,7 +66,8 @@
                        :key :rotation}]}}]
    [:spacing
     {:title "Spacing"
-     :attributes ctt/spacing-keys
+     :attributes #{:column-gap :row-gap}
+     :all-attributes ctt/spacing-keys
      :on-update-shape wtch/update-layout-spacing
      :modal {:key :tokens/spacing
              :fields [{:label "Spacing"