diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs
index f9d0a6b26ca..0fd6eba5f90 100644
--- a/src/main/frontend/components/header.cljs
+++ b/src/main/frontend/components/header.cljs
@@ -15,6 +15,7 @@
             [frontend.components.repo :as repo]
             [frontend.components.search :as search]
             [frontend.components.export :as export]
+            [frontend.components.right-sidebar :as sidebar]
             [frontend.handler.project :as project-handler]
             [frontend.handler.page :as page-handler]
             [frontend.handler.web.nfs :as nfs]
@@ -213,6 +214,4 @@
                        :t t
                        :current-repo current-repo
                        :default-home default-home})
-
-       [:a.close-arrow.opacity-50.hover:opacity-100.ml-4 {:on-click state/toggle-sidebar-open?!}
-        (svg/big-arrow-right)]])))
+       (when (not (state/sub :ui/sidebar-open?)) (sidebar/toggle))])))
diff --git a/src/main/frontend/components/right_sidebar.cljs b/src/main/frontend/components/right_sidebar.cljs
index df0829cd522..9c802fd4c62 100644
--- a/src/main/frontend/components/right_sidebar.cljs
+++ b/src/main/frontend/components/right_sidebar.cljs
@@ -25,6 +25,11 @@
             [frontend.db-mixins :as db-mixins]
             [frontend.config :as config]))
 
+(rum/defc toggle
+  []
+  [:a.opacity-50.hover:opacity-100.ml-4 {:on-click state/toggle-sidebar-open?!}
+   (svg/menu)])
+
 (rum/defc block-cp < rum/reactive
   [repo idx block]
   (let [id (:block/uuid block)]
@@ -263,7 +268,7 @@
          [:div.cp__right-sidebar-inner.flex.flex-col.h-full
 
           (sidebar-resizer)
-          [:div.flex.flex-row.justify-between.items-center.px-4
+          [:div.flex.flex-row.justify-between.items-center.px-4.h-12
            [:div.cp__right-sidebar-settings.hide-scrollbar {:key "right-sidebar-settings"}
             [:div.ml-4.text-sm
              [:a.cp__right-sidebar-settings-btn {:on-click (fn [e]
@@ -289,7 +294,9 @@
             [:div.ml-4.text-sm
              [:a.cp__right-sidebar-settings-btn {:on-click (fn [_e]
                                                              (state/sidebar-add-block! repo "help" :help nil))}
-              (t :right-side-bar/help)]]]]
+              (t :right-side-bar/help)]]]
+
+           (when sidebar-open? (toggle))]
           [:.sidebar-item-list.overflow-y-auto.flex-1
            (for [[idx [repo db-id block-type block-data]] (medley/indexed blocks)]
              (rum/with-key
diff --git a/src/main/frontend/components/sidebar.css b/src/main/frontend/components/sidebar.css
index 6861a37f0ba..7ad77ae2177 100644
--- a/src/main/frontend/components/sidebar.css
+++ b/src/main/frontend/components/sidebar.css
@@ -141,10 +141,6 @@
     }
   }
 
-  .close-arrow svg {
-    transform: scale(0.8);
-  }
-
   .page {
     margin-top: 0;
   }