diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index ff6ce11a4..93da227b2 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -23,11 +23,6 @@ template(name="boardHeaderBar")
               span
                 = currentBoard.stars
 
-          a.board-header-btn.js-keyboard-shortcuts-toggle(
-            title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
-            i.fa(class="fa-solid fa-keyboard")
-            i.fa(class="fa-solid fa-{{#if isKeyboardShortcuts}}check-square-o{{else}}ban{{/if}}")
-
           a.board-header-btn(
             class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
             title="{{_ currentBoard.permission}}")
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 83f693660..01859ead5 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -39,11 +39,6 @@ BlazeComponent.extendComponent({
     return user && user.hasStarred(boardId);
   },
 
-  isKeyboardShortcuts() {
-    const user = ReactiveCache.getCurrentUser();
-    return user && user.isKeyboardShortcuts();
-  },
-
   // Only show the star counter if the number of star is greater than 2
   showStarCounter() {
     const currentBoard = Utils.getCurrentBoard();
@@ -77,9 +72,6 @@ BlazeComponent.extendComponent({
         'click .js-star-board'() {
           ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
         },
-        'click .js-keyboard-shortcuts-toggle'() {
-          ReactiveCache.getCurrentUser().toggleKeyboardShortcuts();
-        },
         'click .js-open-board-menu': Popup.open('boardMenu'),
         'click .js-change-visibility': Popup.open('boardChangeVisibility'),
         'click .js-watch-board': Popup.open('boardChangeWatch'),
diff --git a/client/components/sidebar/sidebar.css b/client/components/sidebar/sidebar.css
index 769be3a95..9db528cf2 100644
--- a/client/components/sidebar/sidebar.css
+++ b/client/components/sidebar/sidebar.css
@@ -104,10 +104,14 @@
 }
 .sidebar .sidebar-shortcuts {
   top: 7px;
-  font-size: 0.8em;
+  font-size: 1em;
   line-height: 1.6em;
   color: #999;
 }
+.sidebar .sidebar-shortcuts .sidebar-btn {
+  margin-left: 3px;
+  margin-right: 20px;
+}
 .board-sidebar {
   display: none;
   width: 30vw;
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 65c002a47..59548713c 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -6,9 +6,12 @@ template(name="sidebar")
     //  i.fa.fa-navicon
     .sidebar-actions
       .sidebar-shortcuts
-        a.board-header-btn.js-shortcuts(title="{{_ 'keyboard-shortcuts' }}")
+        a.sidebar-btn.js-shortcuts(title="{{_ 'keyboard-shortcuts' }}")
           i.fa.fa-keyboard-o
           span {{_ 'keyboard-shortcuts' }}
+        a.sidebar-btn.js-keyboard-shortcuts-toggle(
+          title="{{#if isKeyboardShortcuts}}{{_ 'keyboard-shortcuts-enabled'}}{{else}}{{_ 'keyboard-shortcuts-disabled'}}{{/if}}")
+          i.fa(class="fa-solid fa-{{#if isKeyboardShortcuts}}check-square-o{{else}}ban{{/if}}")
       a.sidebar-xmark.js-close-sidebar ✕
     .sidebar-content.js-board-sidebar-content
       //a.hide-btn.js-hide-sidebar
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index f7e8f2b2b..e9329fc27 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -105,6 +105,11 @@ BlazeComponent.extendComponent({
     else return `${TAPi18n.__('sidebar-open')}`;
   },
 
+  isKeyboardShortcuts() {
+    const user = ReactiveCache.getCurrentUser();
+    return user && user.isKeyboardShortcuts();
+  },
+
   events() {
     return [
       {
@@ -126,6 +131,9 @@ BlazeComponent.extendComponent({
         'click .js-shortcuts'() {
           FlowRouter.go('shortcuts');
         },
+        'click .js-keyboard-shortcuts-toggle'() {
+          ReactiveCache.getCurrentUser().toggleKeyboardShortcuts();
+        },
         'click .js-close-sidebar'() {
           Sidebar.toggle()
         },