3 files changed, 10 insertions, 8 deletions

diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index c5c320f52..01cd3b09b 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -10,7 +10,7 @@ import { H1 } from '@meetfranz/ui';
 
 import { compact, invoke } from 'lodash';
 import Modal from '../../components/ui/Modal';
-import { state as ModalState } from '.';
+import { state as ModalState } from './store';
 import ServicesStore from '../../stores/ServicesStore';
 
 const messages = defineMessages({
diff --git a/src/features/quickSwitch/index.js b/src/features/quickSwitch/index.js
index c57fad366..a16017219 100644
--- a/src/features/quickSwitch/index.js
+++ b/src/features/quickSwitch/index.js
@@ -1,15 +1,10 @@
-import { observable } from 'mobx';
+import { state as ModalState } from './store';
 
 export { default as Component } from './Component';
+const state = ModalState;
 
 const debug = require('debug')('Ferdi:feature:quickSwitch');
 
-const defaultState = {
-  isModalVisible: false,
-};
-
-export const state = observable(defaultState);
-
 export default function initialize() {
   debug('Initialize quickSwitch feature');
 
diff --git a/src/features/quickSwitch/store.js b/src/features/quickSwitch/store.js
new file mode 100644
index 000000000..ed06e5a7d
--- /dev/null
+++ b/src/features/quickSwitch/store.js
@@ -0,0 +1,7 @@
+import { observable } from 'mobx';
+
+const defaultState = {
+  isModalVisible: false,
+};
+
+export const state = observable(defaultState);