1 files changed, 7 insertions, 7 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 816f545ee..30058f41d 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import { action, computed, observable, extendObservable } from 'mobx';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -17,10 +17,6 @@ export default class SettingsStore extends Store {
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
-
-    // this.registerReactions([
-    //   this._shareSettingsWithMainProcess.bind(this),
-    // ]);
   }
 
   setup() {
@@ -34,9 +30,13 @@ export default class SettingsStore extends Store {
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    await this.allSettingsRequest.patch((result) => {
+      if (!result) return;
+      extendObservable(result, settings);
+    });
 
-    this._shareSettingsWithMainProcess();
+    // We need a little hack to wait until everything is patched
+    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
 
     gaEvent('Settings', 'update');
   }