2 files changed, 7 insertions, 2 deletions

diff --git a/src/index.ts b/src/index.ts
index 739f653d4..4b3c81faa 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -270,7 +270,12 @@ const createWindow = () => {
   if (isWindows) {
     onDidLoad((window: BrowserWindow) => {
       const url = process.argv.slice(1);
-      if (url) {
+      if (
+        url &&
+        // The next line is a workaround after this 71c5237 [chore: Mobx & React-Router upgrade (#406)].
+        // For some reason, the app won't start until because it's trying to route to './build'.
+        url.toString() !== './build'
+      ) {
         handleDeepLink(window, url.toString());
       }
     });
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c2b43bd5c..78849d616 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -638,7 +638,7 @@ class FranzMenu {
   }
 
   get template() {
-    return this.currentTemplate.toJS();
+    return JSON.parse(JSON.stringify(this.currentTemplate));
   }
 
   _build() {