diff --git a/assets/js/app.js b/assets/js/app.js
index afb2ef5..dc3b466 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -180,16 +180,10 @@ let liveSocket = new LiveSocket("/live", Socket, {
 let routeUpdated = () => {
   let target = document.querySelector("main h1") || document.querySelector("main")
   if (target) {
-    let origTabIndex = target.getAttribute("tabindex")
-    target.setAttribute("tabindex", "-1")
+    let origTabIndex = target.tabIndex
+    target.tabIndex = -1
     target.focus()
-    window.setTimeout(() => {
-      if (origTabIndex) {
-        target.setAttribute("tabindex", origTabIndex)
-      } else {
-        target.removeAttribute("tabindex")
-      }
-    }, 1000)
+    target.tabIndex = origTabIndex
   }
 }
 
@@ -199,7 +193,7 @@ window.addEventListener("phx:page-loading-start", info => topbar.show())
 window.addEventListener("phx:page-loading-stop", info => topbar.hide())
 
 // Accessible routing
-window.addEventListener("phx:page-loading-stop", () => window.requestAnimationFrame(routeUpdated))
+window.addEventListener("phx:page-loading-stop", routeUpdated)
 
 window.addEventListener("js:exec", e => e.target[e.detail.call](...e.detail.args))