diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
index 21a5c5faf..0c7f4eb0d 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
@@ -50,6 +50,9 @@
         m3 (:m3 value)
         m4 (:m4 value)
 
+        m1-placeholder (if (and (not= value :multiple) (not= m1 m3)) (tr "settings.multiple") "--")
+        m2-placeholder (if (and (not= value :multiple) (not= m2 m4)) (tr "settings.multiple") "--")
+
         m1 (when (and (not= value :multiple) (= m1 m3)) m1)
         m2 (when (and (not= value :multiple) (= m2 m4)) m2)
 
@@ -74,14 +77,13 @@
                           (keyword))]
              (on-change :simple attr value))))]
 
-
     [:div {:class (stl/css :margin-simple)}
      [:div {:class (stl/css :vertical-margin)
             :title "Vertical margin"}
       [:span {:class (stl/css :icon)}
        i/margin-top-bottom]
       [:> numeric-input* {:class (stl/css :numeric-input)
-                          :placeholder "--"
+                          :placeholder m1-placeholder
                           :data-name "m1"
                           :on-focus on-focus
                           :on-change on-change'
@@ -94,7 +96,7 @@
       [:span {:class (stl/css :icon)}
        i/margin-left-right]
       [:> numeric-input* {:class (stl/css :numeric-input)
-                          :placeholder "--"
+                          :placeholder m2-placeholder
                           :data-name "m2"
                           :on-focus on-focus
                           :on-change on-change'
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 e11e6e48c..ab380f751 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
@@ -12,6 +12,7 @@
    [app.common.types.tokens-lib :as ctob]
    [app.main.data.modal :as modal]
    [app.main.data.tokens :as dt]
+   [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
@@ -151,6 +152,18 @@
                           all-attr-labels)]
     (concat multi-items single-items)))
 
+(defn update-shape-layout-padding [value shape-ids attributes]
+  (st/emit!
+   (when (= (count attributes) 1)
+     (dwsl/update-layout shape-ids {:layout-padding-type :multiple}))
+   (wtch/update-layout-padding value shape-ids attributes)))
+
+(defn update-shape-layout-margin [value shape-ids attributes]
+  (st/emit!
+   (when (= (count attributes) 1)
+     (dwsl/update-layout shape-ids {:layout-item-margin-type :multiple}))
+   (wtch/update-layout-item-margin value shape-ids attributes)))
+
 (defn spacing-attribute-actions [{:keys [token selected-shapes] :as context-data}]
   (let [padding-items (layout-spacing-items {:token token
                                              :selected-shapes selected-shapes
@@ -162,7 +175,7 @@
                                                                       :p4 "Padding left"}
                                              :vertical-attr-labels {:p1 "Padding top"
                                                                     :p3 "Padding bottom"}
-                                             :on-update-shape wtch/update-layout-padding})
+                                             :on-update-shape update-shape-layout-padding})
         margin-items (layout-spacing-items {:token token
                                             :selected-shapes selected-shapes
                                             :all-attr-labels {:m1 "Margin top"
@@ -173,7 +186,7 @@
                                                                      :m4 "Margin left"}
                                             :vertical-attr-labels {:m1 "Margin top"
                                                                    :m3 "Margin bottom"}
-                                            :on-update-shape wtch/update-layout-item-margin})
+                                            :on-update-shape update-shape-layout-margin})
         gap-items (all-or-sepearate-actions {:attribute-labels {:column-gap "Column Gap"
                                                                 :row-gap "Row Gap"}
                                              :on-update-shape wtch/update-layout-spacing}