diff --git a/themes/finna2/js/finna-common.js b/themes/finna2/js/finna-common.js
index a344f3187ac..9d230dd08fc 100644
--- a/themes/finna2/js/finna-common.js
+++ b/themes/finna2/js/finna-common.js
@@ -64,14 +64,17 @@ finna.common = (function finnaCommon() {
    */
   function initResultsEventHandler() {
     VuFind.listen('results-load', () => {
-      setTimeout(
-        function focusHeading() {
-          const heading = document.getElementById("results-heading");
-          if (heading) {
-            heading.focus();
+      setTimeout(() => {
+        var storagedEl = window.sessionStorage.getItem('clickedMenu');
+        if (storagedEl) {
+          window.sessionStorage.removeItem('clickedMenu');
+          var focusedEl = document.querySelector(storagedEl);
+          if (focusedEl) {
+            focusedEl.focus();
           }
-        },
-        200
+        }
+      },
+      200
       );
     });
     VuFind.listen('results-loaded', () => {
@@ -91,16 +94,30 @@ finna.common = (function finnaCommon() {
       };
       link.addEventListener('click', function handleClick(event) {
         event.preventDefault();
+        window.sessionStorage.setItem('clickedMenu', `${type}-dropdown a.dropdown-toggle`);
         // Update button text:
         const dropdownEl = link.closest('.dropdown');
+        const dropdownLabel = type === 'sort' ? 'Sort' : 'Results per page';
         if (dropdownEl) {
           const toggleEl = dropdownEl.querySelector('.dropdown-toggle');
           if (toggleEl) {
+            toggleEl.ariaLabel = VuFind.translate(dropdownLabel) + ': ' + VuFind.translate(link.innerText) + ' ' + VuFind.translate('selected');
             const spanEl = toggleEl.querySelector('span');
             if (spanEl) {
               spanEl.innerText = link.innerText;
             }
           }
+          const menuEl = dropdownEl.querySelector('.dropdown-menu');
+          if (menuEl) {
+            menuEl.querySelectorAll("li > a").forEach(element => {
+              if (element.ariaDescription) {
+                element.removeAttribute("aria-description");
+              }
+              if (element.innerText.trim() === toggleEl.innerText.trim()) {
+                element.ariaDescription = VuFind.translate('selected');
+              }
+            });
+          }
         }
         // Get relevant data from the link and change the hidden field accordingly:
         const urlParts = link.getAttribute('href').split('?', 2);
diff --git a/themes/finna2/templates/layout/finna-js-translations.phtml b/themes/finna2/templates/layout/finna-js-translations.phtml
index ff454f50916..d822f060a8f 100644
--- a/themes/finna2/templates/layout/finna-js-translations.phtml
+++ b/themes/finna2/templates/layout/finna-js-translations.phtml
@@ -21,6 +21,16 @@ $this->jsTranslations()->addStrings(
         'show_filters' => 'show_filters',
         'hide_filters' => 'hide_filters',
 
+        'Sort' => 'Sort',
+        'Results per page' => 'Results per page',
+        'sort_relevance' => 'sort_relevance',
+        'sort_year' => 'sort_year',
+        'sort_year asc' => 'sort_year asc',
+        'sort_callnumber' => 'sort_callnumber',
+        'sort_author' => 'sort_author',
+        'sort_title' => 'sort_title',
+        'sort_last_indexed' => 'sort_last_indexed',
+
         'radiusPrefix' => 'Radius',
         'circleCaption' => 'Select Area',
         'clearCaption' => 'Clear Selections',
diff --git a/themes/finna2/templates/search/controls/limit.phtml b/themes/finna2/templates/search/controls/limit.phtml
index b0c5dd552af..899ae7a5a36 100644
--- a/themes/finna2/templates/search/controls/limit.phtml
+++ b/themes/finna2/templates/search/controls/limit.phtml
@@ -8,7 +8,7 @@
       <div class="dropdown">
         <?php foreach ($limitList as $limitVal => $limitData): ?>
           <?php if ($limitData['selected']): ?>
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-label="<?=$this->transEscAttr('Results per page') . ': ' . $this->transEscAttr($limitData['desc'])?>">
+          <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-label="<?=$this->transEscAttr('Results per page') . ': ' . $this->transEscAttr($limitData['desc']) . ' ' . $this->transEsc('selected')?>">
             <span><?=$this->transEsc($limitData['desc'])?></span> <?=$this->icon('dropdown-open') ?>
           </a>
           <?php endif; ?>
@@ -16,7 +16,7 @@
         <ul class="dropdown-menu" role="menu" aria-labelledby="limit-label">
           <?php foreach ($limitList as $limitVal => $limitData): ?>
           <li>
-            <a href="Results<?=$this->results->getUrlQuery()->setLimit($limitVal)?>" role="menuitem" aria-label="<?=$this->transEscAttr('Results per page') . ': ' . $this->transEscAttr($limitData['desc'])?>"><?=$this->transEsc($limitData['desc'])?></a>
+            <a href="Results<?=$this->results->getUrlQuery()->setLimit($limitVal)?>" role="menuitem" <?php if ($limitData['selected']):?>aria-description="<?=$this->transEsc('selected')?>"<?php endif;?>><?=$this->transEsc($limitData['desc'])?></a>
           <?php endforeach; ?>
           </li>
         </ul>
diff --git a/themes/finna2/templates/search/controls/sort.phtml b/themes/finna2/templates/search/controls/sort.phtml
index bcd36209250..18a47bf5148 100644
--- a/themes/finna2/templates/search/controls/sort.phtml
+++ b/themes/finna2/templates/search/controls/sort.phtml
@@ -9,7 +9,7 @@ if (!empty($list)): ?>
         <?php $selectedFound = false; ?>
         <?php foreach ($list as $sortType => $sortData): ?>
           <?php if ($sortData['selected']): ?>
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-label="<?= $this->transEsc('Sort') . ': ' . $this->transEsc($sortData['desc'])?>">
+            <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-label="<?= $this->transEsc('Sort') . ': ' . $this->transEsc($sortData['desc']) . ' ' . $this->transEsc('selected')?>">
               <span><?=$this->transEsc($sortData['desc'])?></span> <?=$this->icon('dropdown-open') ?>
             </a>
             <?php $selectedFound = true; ?>
@@ -23,7 +23,7 @@ if (!empty($list)): ?>
         <ul class="dropdown-menu" role="menu" aria-labelledby="sort-label">
           <?php foreach ($list as $sortType => $sortData): ?>
           <li>
-            <a href="Results<?=isset($sortData['url']) ? $this->escapeHtmlAttr($sortData['url']) : $this->results->getUrlQuery()->setSort($sortType)?>" role="menuitem" aria-label="<?= $this->transEsc('Sort') . ': ' . $this->transEsc($sortData['desc'])?>"><?=$this->transEsc($sortData['desc'])?></a>
+            <a href="Results<?=isset($sortData['url']) ? $this->escapeHtmlAttr($sortData['url']) : $this->results->getUrlQuery()->setSort($sortType)?>" role="menuitem" <?php if ($sortData['selected']):?>aria-description="<?=$this->transEsc('selected')?>"<?php endif;?>><?=$this->transEsc($sortData['desc'])?></a>
           <?php endforeach; ?>
           </li>
         </ul>
diff --git a/themes/finna2/templates/search/controls/view.phtml b/themes/finna2/templates/search/controls/view.phtml
index 1386f593b1a..86e4b00c90f 100644
--- a/themes/finna2/templates/search/controls/view.phtml
+++ b/themes/finna2/templates/search/controls/view.phtml
@@ -15,7 +15,7 @@
     <div class="view-options">
       <?php foreach ($viewList as $viewType => $viewData): ?>
         <div class="view-button <?= $viewData['selected'] ? 'selected' : '' ?>">
-          <a href="<?=$this->results->getUrlQuery()->setViewParam($viewType)?>" title="<?=$this->transEsc('Show As ' . $viewData['desc'])?>" aria-label="<?=$this->transEsc('Show As ' . $viewData['desc'])?>"><?= $this->icon('view-' . $viewType, 'icon-' . $viewType) ?></a>
+          <a href="<?=$this->results->getUrlQuery()->setViewParam($viewType)?>" role="button" aria-label="<?=$this->transEsc('show_as') . ': ' . $this->transEsc('Show As ' . $viewData['desc'])?>" <?php if ($viewData['selected']):?>aria-description="<?=$this->transEsc('selected')?>"<?php endif; ?>><?= $this->icon('view-' . $viewType, 'icon-' . $viewType) ?></a>
         </div>
       <?php endforeach; ?>
     </div>
@@ -24,7 +24,7 @@
       <div class="dropdown">
         <?php foreach ($viewList as $viewType => $viewData): ?>
           <?php if ($viewData['selected']): ?>
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-label="<?=$this->transEsc('show_as') . ': ' . $this->transEsc('Show As ' . $viewData['desc'])?>"><?=$this->icon('view-' . $viewType, 'icon-' . $viewType) ?> <span class="<?=($isCollection ?? false) ? 'hidden-xs hidden-sm' : '' ?>"><?=$this->transEsc('Show As ' . $viewData['desc'])?></span> <?=$this->icon('dropdown-open') ?></a>
+            <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-label="<?=$this->transEsc('show_as') . ': ' . $this->transEsc('Show As ' . $viewData['desc']) . ' ' . $this->transEsc('selected')?>"><?=$this->icon('view-' . $viewType, 'icon-' . $viewType) ?> <span class="<?=($isCollection ?? false) ? 'hidden-xs hidden-sm' : '' ?>"><?=$this->transEsc('Show As ' . $viewData['desc'])?></span> <?=$this->icon('dropdown-open') ?></a>
           <?php endif; ?>
         <?php endforeach; ?>
 
@@ -41,7 +41,7 @@
               }
             ?>
             <li>
-              <a href="<?=$viewUrl?>" title="<?=$this->transEsc($viewData['desc'])?>" role="menuitem" aria-label="<?=$this->transEsc('show_as') . ': ' . $this->transEsc('Show As ' . $viewData['desc'])?>" >
+              <a href="<?=$viewUrl?>" role="menuitem" <?php if ($viewData['selected']):?>aria-description="<?=$this->transEsc('selected')?>"<?php endif;?>>
                 <?=$this->icon('view-' . $viewType, 'icon-' . $viewType) ?> <?=$this->transEsc('Show As ' . $viewData['desc'])?>
               </a>
             </li>