diff --git a/core/src/utils/input-shims/hacks/scroll-assist.ts b/core/src/utils/input-shims/hacks/scroll-assist.ts
index 63a1983a76..6c3514f44a 100644
--- a/core/src/utils/input-shims/hacks/scroll-assist.ts
+++ b/core/src/utils/input-shims/hacks/scroll-assist.ts
@@ -70,6 +70,7 @@ const jsSetFocus = (
         clearTimeout(scrollContentTimeout);
       }
       window.removeEventListener('resize', scrollContent);
+      window.removeEventListener('keyboardWillShow', scrollContent);
 
       // scroll the input into place
       await contentEl.scrollByPoint(0, scrollData.scrollAmount, scrollData.scrollDuration);
@@ -83,9 +84,10 @@ const jsSetFocus = (
     };
 
     window.addEventListener('resize', scrollContent);
+    window.addEventListener('keyboardWillShow', scrollContent);
 
     // fallback in case resize never fires
-    scrollContentTimeout = setTimeout(scrollContent, 1000);
+    scrollContentTimeout = setTimeout(scrollContent, 300);
   }
 };