early return in second case

Author: brc-dd

src/client/app/router.ts

@@ -291,13 +291,14 @@ export function scrollTo(hash: string, smooth = false, scrollPosition = 0) {
 
     // target is not focusable, make it temporarily focusable
     const tabindex = target.getAttribute('tabindex')
-    target.setAttribute('tabindex', '-1')
+    if (tabindex !== null) return // it's not focusable because of some other reason
 
     const restoreTabindex = () => {
-      if (tabindex == null) target.removeAttribute('tabindex')
-      else target.setAttribute('tabindex', tabindex)
+      target.removeAttribute('tabindex')
       target.removeEventListener('blur', restoreTabindex)
     }
+
+    target.setAttribute('tabindex', '-1')
     target.addEventListener('blur', restoreTabindex)
 
     target.focus({ preventScroll: true })