fix observable template

2 files changed, 5 insertions, 4 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 20fe61092..6162840be 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -6,7 +6,6 @@ import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
 import globalMessages from '../../i18n/globalMessages';
-import Menu from '../../lib/Menu';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 75f2efbea..3b02273ed 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -116,6 +116,7 @@ const template = [
 
 export default class FranzMenu {
   @observable tpl = template;
+  @observable template = null;
 
   constructor(stores, actions) {
     this.stores = stores;
@@ -124,12 +125,12 @@ export default class FranzMenu {
     autorun(this._build.bind(this));
   }
 
-  @computed get template() {
-    return toJS(this.tpl);
+  get template() {
+    return this.template;
   }
 
   _build() {
-    const tpl = this.template;
+    const tpl = toJS(this.tpl);
 
     tpl[1].submenu.push({
       role: 'toggledevtools',
@@ -252,6 +253,7 @@ export default class FranzMenu {
       tpl[isMac ? 3 : 2].submenu = toJS(this.serviceTpl);
     }
 
+    this.template = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
   }