1 files changed, 10 insertions, 3 deletions

diff --git a/src/index.js b/src/index.js
index 87aa6357b..3453b46f7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,9 +9,16 @@ import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
-if (process.platform === 'win32') {
-  app.setPath('appData', process.env.LOCALAPPDATA);
-  app.setPath('userData', path.join(process.env.LOCALAPPDATA, app.getName()));
+// Set app directory before loading user modules
+if (process.env.FERDI_APPDATA_DIR != null) {
+  app.setPath('appData', process.env.FERDI_APPDATA_DIR);
+  app.setPath('userData', path.join(app.getPath('appData')));
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`));
+} else if (process.platform === 'win32') {
+  app.setPath('appData', process.env.APPDATA);
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
 }
 
 if (isDevMode) {