diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
index 2bd91606..5816f1b6 100644
--- a/src/browser/components/MattermostView.jsx
+++ b/src/browser/components/MattermostView.jsx
@@ -100,7 +100,7 @@ const MattermostView = React.createClass({
 
         osLocale().then((locale) => {
           if (locale === 'ja_JP') {
-            applyCssFile(__dirname + '/css/jp_fonts.css');
+            applyCssFile(remote.app.getAppPath() + '/css/jp_fonts.css');
           }
         });
       }
diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 87c86f20..0c5f089c 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -18,7 +18,7 @@ const appLauncher = new AutoLaunch({
 
 function backToIndex(index) {
   const target = typeof index === 'undefined' ? 0 : index;
-  const indexURL = remote.getGlobal('isDev') ? 'http://localhost:8080/browser/index.html' : `file://${__dirname}/index.html`;
+  const indexURL = remote.getGlobal('isDev') ? 'http://localhost:8080/browser/index.html' : `file://${remote.app.getAppPath()}/browser/index.html`;
   remote.getCurrentWindow().loadURL(`${indexURL}?index=${target}`);
 }
 
diff --git a/src/main.js b/src/main.js
index 31665b21..89c39b0f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -490,7 +490,7 @@ app.on('ready', () => {
   }
 
   // and load the index.html of the app.
-  const indexURL = global.isDev ? 'http://localhost:8080/browser/index.html' : 'file://' + __dirname + '/browser/index.html';
+  const indexURL = global.isDev ? 'http://localhost:8080/browser/index.html' : `file://${app.getAppPath()}/browser/index.html`;
   mainWindow.loadURL(indexURL);
 
   // Set application menu
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index a79c35ba..4ec3355e 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -4,7 +4,7 @@ const electron = require('electron');
 const Menu = electron.Menu;
 
 function createTemplate(mainWindow, config, isDev) {
-  const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : 'file://' + __dirname + '/browser/settings.html';
+  const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${electron.app.getAppPath()}/browser/settings.html`;
 
   const separatorItem = {
     type: 'separator'
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 6f142dfc..1de7615f 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -6,7 +6,7 @@ const {
 } = require('electron');
 
 function createTemplate(mainWindow, config, isDev) {
-  const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${__dirname}/browser/settings.html`;
+  const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${app.getAppPath()}/browser/settings.html`;
   var template = [
     ...config.teams.slice(0, 9).map((team, i) => {
       return {
diff --git a/webpack.config.main.js b/webpack.config.main.js
index 8a88b038..504ca58b 100644
--- a/webpack.config.main.js
+++ b/webpack.config.main.js
@@ -9,8 +9,8 @@ module.exports = merge(base, {
     filename: './src/[name]_bundle.js'
   },
   node: {
-    __filename: false,
-    __dirname: false
+    __filename: true,
+    __dirname: true
   },
   target: 'electron-main',
   externals: {
diff --git a/webpack.config.renderer.js b/webpack.config.renderer.js
index 877fae39..eecfee9a 100644
--- a/webpack.config.renderer.js
+++ b/webpack.config.renderer.js
@@ -28,8 +28,8 @@ module.exports = merge(base, {
     }]
   },
   node: {
-    __filename: false,
-    __dirname: false
+    __filename: true,
+    __dirname: true
   },
   target: 'electron-renderer',
   devServer: {