chore: merge from nightly branch into release branch in prep for next beta

1 files changed, 3 insertions, 3 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 9e5fed996..3b499a5db 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
-import path from 'path';
+import { join } from 'path';
 
 import ServiceModel from '../../../models/Service';
 
@@ -59,7 +59,7 @@ class ServiceWebview extends Component {
       isSpellcheckerEnabled,
     } = this.props;
 
-    const preloadScript = path.join(__dirname, '../../../', 'webview', 'recipe.js');
+    const preloadScript = join(__dirname, '..', '..', '..', 'webview', 'recipe.js');
 
     return (
       <ElectronWebView
@@ -83,7 +83,7 @@ class ServiceWebview extends Component {
         useragent={service.userAgent}
         disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined}
         allowpopups
-        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=false`}
+        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`}
       />
     );
   }