Merge branch 'feature/dark-theme' into develop

1 files changed, 6 insertions, 2 deletions

diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index b3138e948..254180b73 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -17,7 +17,7 @@ export default class Settings {
   }
 
   set(settings) {
-    this.store = Object.assign(this.store, settings);
+    this.store = this._merge(settings);
 
     this._writeFile();
   }
@@ -30,8 +30,12 @@ export default class Settings {
     return this.store[key];
   }
 
+  _merge(settings) {
+    return Object.assign(DEFAULT_APP_SETTINGS, this.store, settings);
+  }
+
   _hydrate() {
-    this.store = readJsonSync(SETTINGS_PATH);
+    this.store = this._merge(readJsonSync(SETTINGS_PATH));
     debug('Hydrate store', toJS(this.store));
   }