Merge branch 'develop' into feature/spellcheck-settings

1 files changed, 6 insertions, 2 deletions

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');
   }