diff --git a/static/templates/index.html b/static/templates/index.html
index dac6468a2..c029f2471 100644
--- a/static/templates/index.html
+++ b/static/templates/index.html
@@ -93,7 +93,7 @@
         </div>
       </div>
       <form id='kiwixSearchForm' class='kiwixNav__SearchForm'>
-        <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
+        <input type="text" name="q" accesskey="s" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
         <span class="kiwixButton tagFilterLabel"></span>
         <input type="submit" class="kiwixButton kiwixButtonHover" id="searchButton" value="Search"/>
       </form>
diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html
index 71c7ab6d6..cb7479298 100644
--- a/static/templates/no_js_library_page.html
+++ b/static/templates/no_js_library_page.html
@@ -90,7 +90,7 @@
         </div>
       </div>
       <form id='kiwixSearchForm' class='kiwixNav__SearchForm' action="{{root}}/nojs">
-        <input type="text" name="q" placeholder="{{translations.search}}" id="searchFilter" class='kiwixSearch filter' value="{{searchQuery}}">
+        <input type="text" name="q" accesskey="s" placeholder="{{translations.search}}" id="searchFilter" class='kiwixSearch filter' value="{{searchQuery}}">
         <input type="submit" class="kiwixButton kiwixButtonHover" value="{{translations.search}}"/>
       </form>
     </div>
diff --git a/static/viewer.html b/static/viewer.html
index d0f10562a..bc547860a 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -45,14 +45,22 @@
           <input type="checkbox" id="kiwix_button_show_toggle">
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?KIWIXCACHEID" alt=""></label>
           <div class="kiwix_button_cont">
-            <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="./"><button>&#x1f3e0;</button></a>
+            <a id="kiwix_serve_taskbar_library_button"
+               title="Go to welcome page"
+               accesskey="w"
+               aria-label="Go to welcome page"
+               href="./">
+              <button>&#x1f3e0;</button>
+            </a>
             <span id="kiwix_serve_taskbar_book_ui_group">
               <a id="kiwix_serve_taskbar_home_button"
                  title="Go to the main page of the current book"
+                 accesskey="h"
                  aria-label="Go to the main page of the current book"
                  onclick="gotoMainPageOfCurrentBook()"></a>
               <a id="kiwix_serve_taskbar_random_button"
                  title="Go to a randomly selected page"
+                 accesskey="r"
                  aria-label="Go to a randomly selected page"
                  onclick="gotoRandomPage()">
                 <button>&#x1F3B2;</button>
diff --git a/test/library_server.cpp b/test/library_server.cpp
index ea2d94b47..f5082a42f 100644
--- a/test/library_server.cpp
+++ b/test/library_server.cpp
@@ -1171,7 +1171,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "        </div>\n" \
   "      </div>\n" \
   "      <form id='kiwixSearchForm' class='kiwixNav__SearchForm' action=\"/ROOT%23%3F/nojs\">\n" \
-  "        <input type=\"text\" name=\"q\" placeholder=\"Search\" id=\"searchFilter\" class='kiwixSearch filter' value=\"\">\n" \
+  "        <input type=\"text\" name=\"q\" accesskey=\"s\" placeholder=\"Search\" id=\"searchFilter\" class='kiwixSearch filter' value=\"\">\n" \
   "        <input type=\"submit\" class=\"kiwixButton kiwixButtonHover\" value=\"Search\"/>\n" \
   "      </form>\n" \
   "    </div>\n"