diff --git a/src/main/main.js b/src/main/main.js
index 6414c1af5..a0cd7e361 100644
--- a/src/main/main.js
+++ b/src/main/main.js
@@ -12,7 +12,8 @@ const kill = require('tree-kill');
 const child_process = require('child_process');
 const assert = require('assert');
 const localVersion = app.getVersion();
-export const setMenu = require('./menu/main-menu.js');
+const setMenu = require('./menu/main-menu.js');
+export const contextMenu = require('./menu/context-menu');
 
 // Debug configs
 const isDevelopment = process.env.NODE_ENV === 'development';
diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js
index b0e109f1c..838b3697c 100644
--- a/src/renderer/lbry.js
+++ b/src/renderer/lbry.js
@@ -203,7 +203,7 @@ lbry.publishDeprecated = function(
 };
 
 lbry.imagePath = function(file) {
-  return __static +"/img/" + file;
+  return staticResourcesPath + "/img/" + file;
 };
 
 lbry.getMediaType = function(contentType, fileName) {
diff --git a/src/renderer/main.js b/src/renderer/main.js
index e56d3bbfb..419482a4e 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -13,9 +13,16 @@ import "scss/all.scss";
 
 const env = process.env.NODE_ENV || "production";
 const { remote, ipcRenderer, shell } = require("electron");
-const contextMenu = remote.require("./main.js").setMenu;
+const contextMenu = remote.require("./main.js").contextMenu;
 const app = require("./app");
 
+// Workaround for https://github.com/electron-userland/electron-webpack/issues/52
+if (process.env.NODE_ENV !== 'development') {
+  window.staticResourcesPath = require("path").join(remote.app.getAppPath(), "../static").replace(/\\/g, "\\\\");
+} else {
+  window.staticResourcesPath = "";
+}
+
 window.addEventListener("contextmenu", event => {
   contextMenu.showContextMenu(
     remote.getCurrentWindow(),
diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx
index 02b9123b4..53636b33e 100644
--- a/src/renderer/page/settings/view.jsx
+++ b/src/renderer/page/settings/view.jsx
@@ -22,7 +22,7 @@ class SettingsPage extends React.PureComponent {
     });
     const success = () => {
       this.setState({ clearingCache: false });
-      window.location.href = `${__static}/index.html`; //TODO: Update this, since index.html isn't anymore
+      window.location.href = "index.html";
     };
     const clear = () => this.props.clearCache().then(success.bind(this));
 
diff --git a/src/renderer/redux/actions/settings.js b/src/renderer/redux/actions/settings.js
index 6b962a401..01185085e 100644
--- a/src/renderer/redux/actions/settings.js
+++ b/src/renderer/redux/actions/settings.js
@@ -52,7 +52,7 @@ export function doSetClientSetting(key, value) {
 
 export function doGetThemes() {
   return function(dispatch, getState) {
-    const dir = `${__static}/themes`;
+    const dir = `${staticResourcesPath}/themes`;
 
     readdir(dir, (error, files) => {
       if (!error) {
diff --git a/src/renderer/redux/selectors/settings.js b/src/renderer/redux/selectors/settings.js
index 62390a0f9..a504e0df6 100644
--- a/src/renderer/redux/selectors/settings.js
+++ b/src/renderer/redux/selectors/settings.js
@@ -36,5 +36,5 @@ export const selectLanguages = createSelector(
 
 export const selectThemePath = createSelector(
   makeSelectClientSetting(settings.THEME),
-  theme => __static + "/themes/" + (theme || "light") + ".css"
+  theme => staticResourcesPath + "/themes/" + (theme || "light") + ".css"
 );