diff --git a/src/App/App.js b/src/App/App.js
index fb8ad8217..8dba04d7c 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -8,6 +8,13 @@ const App = () => {
     const onPathNotMatch = React.useCallback(() => {
         window.history.back();
     }, []);
+    const onScroll = React.useCallback((event) => {
+        const scrollEvent = new UIEvent('scroll');
+        for (const prop in event.nativeEvent) {
+            scrollEvent[prop] = event.nativeEvent[prop];
+        }
+        window.dispatchEvent(scrollEvent);
+    }, []);
     const services = React.useMemo(() => ({
         keyboardNavigation: new KeyboardNavigation()
     }), []);
@@ -17,11 +24,13 @@ const App = () => {
     return (
         <React.StrictMode>
             <ServicesProvider services={services}>
-                <Router
-                    homePath={'/'}
-                    viewsConfig={routerViewsConfig}
-                    onPathNotMatch={onPathNotMatch}
-                />
+                <div className={'app-content'} onScroll={onScroll}>
+                    <Router
+                        homePath={'/'}
+                        viewsConfig={routerViewsConfig}
+                        onPathNotMatch={onPathNotMatch}
+                    />
+                </div>
             </ServicesProvider>
         </React.StrictMode>
     );
diff --git a/src/App/styles.less b/src/App/styles.less
index ca6ab8ea0..353188b91 100644
--- a/src/App/styles.less
+++ b/src/App/styles.less
@@ -82,9 +82,14 @@ html {
         overflow: auto;
     }
 
-    .routes-container {
+    .app-content {
         width: 100%;
         height: 100%;
+
+        .routes-container {
+            width: 100%;
+            height: 100%;
+        }
     }
 
     ::-webkit-scrollbar {