diff --git a/ui/component/common/wait-until-on-page.jsx b/ui/component/common/wait-until-on-page.jsx
index af0c423f0..51d78ae8a 100644
--- a/ui/component/common/wait-until-on-page.jsx
+++ b/ui/component/common/wait-until-on-page.jsx
@@ -62,7 +62,11 @@ export default function WaitUntilOnPage(props: Props) {
 
     if (ref && ref.current && !shouldRender) {
       window.addEventListener('scroll', handleDisplayingRef);
-      return () => window.removeEventListener('scroll', handleDisplayingRef);
+      window.addEventListener('resize', handleDisplayingRef);
+      return () => {
+        window.removeEventListener('scroll', handleDisplayingRef);
+        window.removeEventListener('resize', handleDisplayingRef);
+      };
     }
   }, [ref, setShouldRender, shouldRender, shouldElementRender]);