diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs
index 5fbabea12..6468e1b4d 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/common.cljs
@@ -22,9 +22,7 @@
            (.scrollIntoViewIfNeeded ^js node)))))
 
     (when visible?
-      [:*
-       [:div.focus-overlay {:on-click handle-click}]
-       [:div.advanced-options-wrapper {:ref ref}
-        [:div.advanced-options {}
-         children]]])))
+      [:div.advanced-options-wrapper {:ref ref}
+       [:div.advanced-options {}
+        children]])))
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
index f6c8698ca..cb2e9fd80 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
@@ -13,7 +13,6 @@
    [app.main.data.workspace.changes :as dch]
    [app.main.store :as st]
    [app.main.ui.icons :as i]
-   [app.main.ui.workspace.sidebar.options.common :refer [advanced-options]]
    [app.main.ui.workspace.sidebar.options.rows.input-row :refer [input-row]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [t]]))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
index f5aaa4524..1c30246c8 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
@@ -117,11 +117,13 @@
             (on-save-grid grid)))
 
         is-default (= (->> grid :params)
-                      (->> grid :type default-grid-params))]
+                      (->> grid :type default-grid-params))
+
+        open? (:show-advanced-options @state)]
 
     [:div.grid-option
-     [:div.grid-option-main
-      [:button.custom-button {:class (when (:show-advanced-options @state) "is-active")
+     [:div.grid-option-main {:style {:display (when open? "none")}}
+      [:button.custom-button {:class (when open? "is-active")
                               :on-click toggle-advanced-options} i/actions]
 
       [:& select {:class "flex-grow"
@@ -148,10 +150,9 @@
        [:button.custom-button {:on-click handle-toggle-visibility} (if display i/eye i/eye-closed)]
        [:button.custom-button {:on-click handle-remove-grid} i/minus]]]
 
-     [:& advanced-options {:visible? (:show-advanced-options @state)
+     [:& advanced-options {:visible? open?
                            :on-close toggle-advanced-options}
-      [:button.custom-button {:class (when (:show-advanced-options @state) "is-active")
-                              :on-click toggle-advanced-options} i/actions]
+      [:button.custom-button {:on-click toggle-advanced-options} i/actions]
       (when (= :square type)
         [:& input-row {:label (t locale "workspace.options.grid.params.size")
                        :class "pixels"
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs
index edb662256..9b6e48735 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs
@@ -98,8 +98,7 @@
           (fn []
             (st/emit! (dch/update-shapes ids #(update-in % [:shadow index :hidden] not)))))]
     [:*
-     [:div.element-set-options-group 
-
+     [:div.element-set-options-group {:style {:display (when @open-shadow "none")}}
       [:div.element-set-actions-button
        {:on-click #(reset! open-shadow true)}
        i/actions]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
index 9c15b74db..36e8acdf0 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
@@ -468,7 +468,8 @@
 
     [:*
      [:div.element-set-options-group.typography-entry
-      {:class (when selected? "selected")}
+      {:class (when selected? "selected")
+       :style {:display (when @open? "none")}}
       [:div.typography-selection-wrapper
        {:class (when on-click "is-selectable")
         :on-click on-click