diff --git a/src/App/App.js b/src/App/App.js
index f601cf4ee..82b12d898 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -2,7 +2,7 @@ require('spatial-navigation-polyfill');
 const React = require('react');
 const { Router } = require('stremio-router');
 const { Core, KeyboardNavigation, ServicesProvider, Shell } = require('stremio/services');
-const { ToastsContainerProvider } = require('stremio/common/Toasts/ToastsContainerContext');
+const { Toasts } = require('stremio/common');
 const routerViewsConfig = require('./routerViewsConfig');
 const styles = require('./styles');
 
@@ -51,14 +51,14 @@ const App = () => {
             <ServicesProvider services={services}>
                 {
                     shellInitialized && coreInitialized ?
-                        <ToastsContainerProvider className={styles['toasts-container']}>
+                        <Toasts.ContainerProvider className={styles['toasts-container']}>
                             <Router
                                 className={styles['router']}
                                 homePath={'/'}
                                 viewsConfig={routerViewsConfig}
                                 onPathNotMatch={onPathNotMatch}
                             />
-                        </ToastsContainerProvider>
+                        </Toasts.ContainerProvider>
                         :
                         <div className={styles['app-loader']} />
                 }
diff --git a/src/common/Toasts/Toasts.js b/src/common/Toasts/Toasts.js
index 9c96ea25a..be964f6b4 100644
--- a/src/common/Toasts/Toasts.js
+++ b/src/common/Toasts/Toasts.js
@@ -1,7 +1,7 @@
 const React = require('react');
 const { Modal } = require('stremio-router');
 const { ModalsContainerContext } = require('stremio-router');
-const { useToastsContainer } = require('./ToastsContainerContext');
+const { useToastsContainer, ToastsContainerProvider } = require('./ToastsContainerContext');
 const Toast = require('./Toast');
 
 const DEFAULT_TIMEOUT = 2000;
@@ -52,4 +52,6 @@ const Toasts = React.forwardRef(({ className }, ref) => {
     );
 });
 
+Toasts.ContainerProvider = ToastsContainerProvider;
+
 module.exports = Toasts;