diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs
index c666aaad8a..a245d08b0f 100644
--- a/src/main/frontend/components/header.cljs
+++ b/src/main/frontend/components/header.cljs
@@ -11,6 +11,7 @@
             [frontend.handler.page :as page-handler]
             [frontend.handler.plugin :as plugin-handler]
             [frontend.handler.user :as user-handler]
+            [frontend.handler.route :as route-handler]
             [frontend.handler.web.nfs :as nfs]
             [frontend.modules.shortcut.core :as shortcut]
             [frontend.state :as state]
@@ -21,7 +22,7 @@
             [rum.core :as rum]
             [frontend.mobile.util :as mobile-util]))
 
-(rum/defc logo < rum/reactive
+(rum/defc home-btn < rum/reactive
   [{:keys [white? electron-mac?]}]
   [:a.cp__header-logo
    {:class (when electron-mac? "button")
@@ -44,8 +45,7 @@
 
       (ui/dropdown-with-links
        (fn [{:keys [toggle-fn]}]
-         [:a.button.text-sm.font-medium.block {:on-click toggle-fn
-                                               :style {:margin-right 12}}
+         [:a.button.text-sm.font-medium.block {:on-click toggle-fn}
           [:span (t :login)]])
        (let [list [;; {:title (t :login-google)
                    ;;  :url (str config/website "/login/google")}
@@ -204,24 +204,26 @@
                                       (open-fn)
                                       (state/set-left-sidebar-open! true))})
 
-       (when-not electron-mac?
-         (logo {:white? white?}))
 
-       (when electron-not-mac? (back-and-forward))
-
-       [:div.flex-1.flex]
+       (home-btn {:white? white? :electron-mac? electron-mac?})
+       (when electron-mac? (back-and-forward true))
 
        (when current-repo
          (ui/tippy
           {:html [:div.text-sm.font-medium
                   "Shortcut: "
+                  ;; TODO: Pull from config so it displays custom shortcut, not just the default
                   [:code (util/->platform-shortcut "Ctrl + k")]]
-           :interactive     true
+           :interactive true
            :arrow true}
           [:a.button#search-button
            {:on-click #(state/pub-event! [:go/search])}
            svg/search]))
 
+       (when electron-not-mac? (back-and-forward))
+
+       [:div.flex-1.flex] ;; Spacer in the middle ------------------------------
+
        (when plugin-handler/lsp-enabled?
          (plugins/hook-ui-items :toolbar))
 
@@ -229,11 +231,6 @@
              [:div {:class "animate-spin-reverse"}
               svg/refresh])]
 
-       (when electron-mac?
-         (logo {:white? white?
-                :electron-mac? true}))
-       (when electron-mac? (back-and-forward true))
-
        (new-block-mode)
 
        (when refreshing?
@@ -264,6 +261,12 @@
          [:a.text-sm.font-medium.button {:href (rfe/href :graph)}
           (t :graph)])
 
+       ;; Go to Keyboard Shortcuts page
+       [:a.button
+        {:title "Keyboard shortcuts"
+         :on-click (fn [] (route-handler/redirect! {:to :shortcut-setting}))}
+        (svg/icon-cmd 20)]
+
        (dropdown-menu {:me me
                        :t t
                        :current-repo current-repo
diff --git a/src/main/frontend/components/onboarding.cljs b/src/main/frontend/components/onboarding.cljs
index cf6f27cdd7..2484672c5c 100644
--- a/src/main/frontend/components/onboarding.cljs
+++ b/src/main/frontend/components/onboarding.cljs
@@ -3,7 +3,6 @@
             [frontend.components.svg :as svg]
             [frontend.context.i18n :as i18n]
             [frontend.handler.route :as route-handler]
-            [frontend.ui :as ui]
             [frontend.util :as util]
             [rum.core :as rum]
             [frontend.config :as config]))
diff --git a/src/main/frontend/modules/shortcut/config.cljs b/src/main/frontend/modules/shortcut/config.cljs
index 3a729fe529..91c9530cec 100644
--- a/src/main/frontend/modules/shortcut/config.cljs
+++ b/src/main/frontend/modules/shortcut/config.cljs
@@ -344,6 +344,10 @@
     {:desc    "Go to home"
      :binding "g h"
      :fn      #(route-handler/redirect! {:to :home})}
+    :go/keyboard-shortcuts
+    {:desc    "Go to keyboard shortcuts"
+     :binding "g s"
+     :fn      #(route-handler/redirect! {:to :shortcut-setting})}
     :ui/toggle-document-mode
     {:desc    "Toggle document mode"
      :binding "t d"
diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs
index 23cedb5f6d..5afb477254 100644
--- a/src/main/frontend/ui.cljs
+++ b/src/main/frontend/ui.cljs
@@ -70,7 +70,7 @@
        :as   opts}]]
   (let [{:keys [open? toggle-fn]} state
         modal-content (modal-content-fn state)]
-    [:div.ml-1.relative {:style {:z-index z-index}}
+    [:div.relative {:style {:z-index z-index}}
      (content-fn state)
      (css-transition
       {:in @open? :timeout 0}