diff --git a/remix-solidity/src/compiler/compiler.js b/remix-solidity/src/compiler/compiler.js
index 849b7b5489..aa361659c1 100644
--- a/remix-solidity/src/compiler/compiler.js
+++ b/remix-solidity/src/compiler/compiler.js
@@ -73,7 +73,8 @@ function Compiler (handleImportCall) {
   function onInternalCompilerLoaded () {
     if (worker === null) {
       var compiler
-      if (typeof (window) === 'undefined') {
+      var userAgent = navigator.userAgent.toLowerCase()
+      if (typeof (window) === 'undefined' || userAgent.indexOf(' electron/') > -1) {
         compiler = require('solc')
       } else {
         compiler = solc(window.Module)