diff --git a/components/LeftPanel/templates/left_panel/view.html.twig b/components/LeftPanel/templates/left_panel/view.html.twig
index 8b6b3285a8..e66da4555b 100644
--- a/components/LeftPanel/templates/left_panel/view.html.twig
+++ b/components/LeftPanel/templates/left_panel/view.html.twig
@@ -1,10 +1,10 @@
 {% block leftpanel %}
-    <label class="panel-left-icon" for="panel-left-toggle" aria-hidden="true"
+    <a id="anchor-left-panel" class="anchor-hidden" title="{{ 'Press tab followed by a space to access left panel' | trans }}"></a>
+    <label class="panel-left-icon" for="panel-left-toggle"
            tabindex="-1">{{ icon('menu', 'icon icon-left') | raw }}</label>
-    <input type="checkbox" id="panel-left-toggle" aria-hidden="true" tabindex="-1">
+    <input type="checkbox" id="panel-left-toggle" tabindex="0" title="{{ 'Open right panel' | trans }}">
 
     <section class="header-panel section-panel-left">
-        <a id="anchor-left-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
         <aside class="panel-content accessibility-target">
             {% if app.user %}
                 <section class='section-widget section-padding' title="{{ 'Your profile information.' | trans }}">
diff --git a/components/RightPanel/templates/right_panel/view.html.twig b/components/RightPanel/templates/right_panel/view.html.twig
index 6554f480c5..8ebd45d043 100644
--- a/components/RightPanel/templates/right_panel/view.html.twig
+++ b/components/RightPanel/templates/right_panel/view.html.twig
@@ -1,10 +1,10 @@
 {% block rightpanel %}
-    <label class="panel-right-icon" for="panel-right-toggle" aria-hidden="true"
+    <a id="anchor-right-panel" class="anchor-hidden" title="{{ 'Press tab followed by a space to access right panel' | trans }}"></a>
+    <label class="panel-right-icon" for="panel-right-toggle"
            tabindex="-1">{{ icon('chevron-left', 'icon icon-right') | raw }}</label>
-    <input type="checkbox" id="panel-right-toggle" aria-hidden="true" tabindex="-1">
+    <input type="checkbox" id="panel-right-toggle" tabindex="0" title="{{ 'Open right panel' | trans }}">
 
     <div class="header-panel section-panel-right">
-        <a id="anchor-right-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
         <aside class="panel-content accessibility-target">
 
             {% set blocks = handle_event('AppendRightPostingBlock', request) %}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 51c0af70d5..167979d28a 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -70,10 +70,10 @@
 
     <nav>
         <ul>
-            <li><a href="#anchor-left-panel" accesskey="h"><kbd>H</kbd>{{ ' for the Left panel.' | trans }}</a></li>
-            <li><a href="#anchor-main-content" accesskey="k"><kbd>K</kbd>{{ ' for the main content.' | trans }}</a></li>
-            <li><a href="#anchor-main-page" accesskey="j"><kbd>J</kbd>{{ ' for the main page.' | trans }}</a></li>
-            <li><a href="#anchor-right-panel" accesskey="l"><kbd>L</kbd>{{ ' for the right panel.' | trans }}</a></li>
+            <li><a href="#anchor-left-panel" accesskey="s"><kbd>S</kbd>{{ ' for the Left panel.' | trans }}</a></li>
+            <li><a href="#anchor-main-content" accesskey="n"><kbd>N</kbd>{{ ' for the main content.' | trans }}</a></li>
+            <li><a href="#anchor-main-page" accesskey="y"><kbd>Y</kbd>{{ ' for the main page.' | trans }}</a></li>
+            <li><a href="#anchor-right-panel" accesskey="j"><kbd>J</kbd>{{ ' for the right panel.' | trans }}</a></li>
         </ul>
     </nav>
 </aside>