diff --git a/lib/focus-trap.tsx b/lib/focus-trap.tsx
index df05f252e..bb80c46f9 100644
--- a/lib/focus-trap.tsx
+++ b/lib/focus-trap.tsx
@@ -29,21 +29,22 @@ export default function FocusTrap({ children, focusFirst = false }: Props) {
 
   const selectFirstFocusableEl = () => {
     // Try to find focusable elements, if match then focus.
+    // Up to 4 seconds of load time threshold
     let match = false
-    let end = 20 // Try to find match at least n times.
+    let end = 22 // Try to find match at least n times.
     let i = 0
     const timer = setInterval(
       () => {
+        console.log('-----------', i)
         if (!match !== i > end) {
           match = !!tabbable(root.current).length
           if (root.current) {
             tabbable(root.current)[0].focus()
           }
+          i = i + 1
         } else {
           clearInterval(timer)
         }
-        i = i++
-        console.log('-----------', i)
       },
       i < 2 ? 0 : 200
     )