5 files changed, 14 insertions, 7 deletions

diff --git a/src/components/ui/AppLoader.js b/src/components/ui/AppLoader.js
index 64a212969..ac3cdcb05 100644
--- a/src/components/ui/AppLoader.js
+++ b/src/components/ui/AppLoader.js
@@ -8,7 +8,7 @@ export default function () {
     <div className="app-loader">
       <Appear>
         <h1 className="app-loader__title">Franz</h1>
-        <Loader />
+        <Loader color="#FFF" />
       </Appear>
     </div>
   );
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index e4fbd96a2..f73296bb6 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -9,12 +9,14 @@ export default class LoaderComponent extends Component {
     children: oneOrManyChildElements,
     loaded: PropTypes.bool,
     className: PropTypes.string,
+    color: PropTypes.string,
   };
 
   static defaultProps = {
     children: null,
     loaded: false,
     className: '',
+    color: '#373a3c',
   };
 
   render() {
@@ -22,6 +24,7 @@ export default class LoaderComponent extends Component {
       children,
       loaded,
       className,
+      color,
     } = this.props;
 
     return (
@@ -30,7 +33,7 @@ export default class LoaderComponent extends Component {
         // lines={10}
         width={4}
         scale={0.6}
-        color="#373a3c"
+        color={color}
         component="span"
         className={className}
       >
diff --git a/src/config.js b/src/config.js
index 4c7363439..60cc6fd7e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -7,7 +7,7 @@ export const GA_ID = 'UA-74126766-6';
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchOnStart: true,
   autoLaunchInBackground: false,
-  runInBackground: false,
+  runInBackground: true,
   enableSystemTray: true,
   minimizeToSystemTray: false,
   showDisabledServices: true,
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 331df5c15..ad3c53ccf 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -35,9 +35,13 @@ export default class SettingsStore extends Store {
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    this.allSettingsRequest.patch((result) => {
+      if (!result) return;
+      Object.assign(result, settings);
+    });
 
-    this._shareSettingsWithMainProcess();
+    // We need a little hack to wait until everything is patched
+    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
 
     gaEvent('Settings', 'update');
   }
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 8347de3b4..3ffc53558 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -67,8 +67,8 @@
     padding: 0px 5px;
     font-size: 11px;
     position: absolute;
-    right: 5px;
-    bottom: 5px;
+    right: 8px;
+    bottom: 8px;
     display: flex;
     justify-content: center;
     align-items: center;