diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
index 512fcfb82..ac624f7b4 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
@@ -256,6 +256,12 @@
 
         select-padding #(select-paddings (= % :p1) (= % :p2) (= % :p3) (= % :p4))]
 
+    (mf/use-effect
+     (fn []
+       (fn []
+         ;;on destroy component
+         (select-paddings false false false false))))
+
     [:div.padding-row
      (cond
        (= padding-type :simple)
@@ -315,6 +321,13 @@
   (let [select-gap
         (fn [gap]
           (st/emit! (udw/set-gap-selected gap)))]
+
+    (mf/use-effect
+     (fn []
+       (fn []
+         ;;on destroy component
+         (select-gap nil))))
+
     [:div.layout-row
      [:div.gap.row-title "Gap"]
      [:div.gap-group
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 d4595ef63..af92826ee 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
@@ -54,6 +54,12 @@
 
         select-margin #(select-margins (= % :m1) (= % :m2) (= % :m3) (= % :m4))]
 
+    (mf/use-effect
+     (fn []
+       (fn []
+         ;;on destroy component
+         (select-margins false false false false))))
+
     [:div.margin-row
      (cond
        (= margin-type :simple)