2 files changed, 8 insertions, 4 deletions

diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index d31819068..e568bf35d 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -15,7 +15,7 @@ function getAsset(type, asset) {
 
 export default (params) => {
   autorun(() => {
-    isTrayIconEnabled = params.settings.get('enableSystemTray');
+    isTrayIconEnabled = params.settings.app.get('enableSystemTray');
 
     if (!isTrayIconEnabled) {
       params.trayIcon.hide();
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 3eab68a91..ce006bb92 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,11 +1,15 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  ipcMain.on('getAppSettings', () => {
-    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  ipcMain.on('getAppSettings', (event, type) => {
+    console.log('getAppSettings', type, params.settings[type].all);
+    params.mainWindow.webContents.send('appSettings', {
+      type,
+      data: params.settings[type].all,
+    });
   });
 
   ipcMain.on('updateAppSettings', (event, args) => {
-    params.settings.set(args);
+    params.settings[args.type].set(args.data);
   });
 };