diff --git a/src/context.tsx b/src/context.tsx
index 7da29d89..583502af 100644
--- a/src/context.tsx
+++ b/src/context.tsx
@@ -1,6 +1,8 @@
 import * as H from 'history';
-import { match} from 'react-router';
-import { NotificationsApi, PopupApi } from './components';
+import { match } from 'react-router';
+
+import { NotificationsApi } from './components/notifications/notification-manager';
+import { PopupApi } from './components/popup/popup-manager';
 
 export interface AppContext {
     router: {